@kdcloudjs/kdesign 1.7.60 → 1.7.62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/CHANGELOG.md +36 -0
  2. package/dist/kdesign-complete.less +6 -3
  3. package/dist/kdesign.css +14 -7
  4. package/dist/kdesign.css.map +1 -1
  5. package/dist/kdesign.js +216 -200
  6. package/dist/kdesign.js.map +1 -1
  7. package/dist/kdesign.min.css +3 -3
  8. package/dist/kdesign.min.js +12 -12
  9. package/dist/kdesign.min.js.map +1 -1
  10. package/es/cascader/cascader.js +15 -15
  11. package/es/cascader/style/index.css +2 -2
  12. package/es/cascader/style/index.less +1 -1
  13. package/es/city-picker/city-picker.js +0 -4
  14. package/es/city-picker/style/index.css +7 -0
  15. package/es/city-picker/style/index.less +3 -0
  16. package/es/date-picker/date-panel.js +2 -2
  17. package/es/date-picker/date-picker.d.ts +2 -1
  18. package/es/date-picker/date-picker.js +25 -1
  19. package/es/date-picker/interface.d.ts +6 -2
  20. package/es/date-picker/locale/zh_CN.js +1 -22
  21. package/es/date-picker/panel/month/month.js +1 -3
  22. package/es/date-picker/range-picker.js +3 -2
  23. package/es/locale/locale.d.ts +2 -1
  24. package/es/locale/zh-CN.d.ts +2 -1
  25. package/es/modal/modal.js +3 -1
  26. package/es/popconfirm/popconfirm.js +1 -1
  27. package/es/select/select.js +1 -1
  28. package/es/select/style/index.css +4 -4
  29. package/es/select/style/token.less +2 -2
  30. package/lib/cascader/cascader.js +15 -15
  31. package/lib/cascader/style/index.css +2 -2
  32. package/lib/cascader/style/index.less +1 -1
  33. package/lib/city-picker/city-picker.js +0 -4
  34. package/lib/city-picker/style/index.css +7 -0
  35. package/lib/city-picker/style/index.less +3 -0
  36. package/lib/date-picker/date-panel.js +2 -2
  37. package/lib/date-picker/date-picker.d.ts +2 -1
  38. package/lib/date-picker/date-picker.js +29 -4
  39. package/lib/date-picker/interface.d.ts +6 -2
  40. package/lib/date-picker/locale/zh_CN.js +1 -22
  41. package/lib/date-picker/panel/month/month.js +3 -5
  42. package/lib/date-picker/range-picker.js +3 -2
  43. package/lib/locale/locale.d.ts +2 -1
  44. package/lib/locale/zh-CN.d.ts +2 -1
  45. package/lib/modal/modal.js +3 -1
  46. package/lib/popconfirm/popconfirm.js +1 -1
  47. package/lib/select/select.js +1 -1
  48. package/lib/select/style/index.css +4 -4
  49. package/lib/select/style/token.less +2 -2
  50. package/package.json +1 -1
  51. package/es/date-picker/locale/en_GB.d.ts +0 -1
  52. package/es/date-picker/locale/en_GB.js +0 -33
  53. package/es/date-picker/locale/en_US.d.ts +0 -1
  54. package/es/date-picker/locale/en_US.js +0 -33
  55. package/es/date-picker/locale/zh_TW.d.ts +0 -1
  56. package/es/date-picker/locale/zh_TW.js +0 -33
  57. package/lib/date-picker/locale/en_GB.d.ts +0 -1
  58. package/lib/date-picker/locale/en_GB.js +0 -33
  59. package/lib/date-picker/locale/en_US.d.ts +0 -1
  60. package/lib/date-picker/locale/en_US.js +0 -33
  61. package/lib/date-picker/locale/zh_TW.d.ts +0 -1
  62. package/lib/date-picker/locale/zh_TW.js +0 -33
@@ -271,12 +271,12 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
271
271
  var arrowIconCls = classNames((_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-icon-arrow"), true), _defineProperty(_classNames, "".concat(prefixCls, "-icon-arrow-up"), visible), _defineProperty(_classNames, "".concat(prefixCls, "-icon-arrow-down"), !visible), _defineProperty(_classNames, "".concat(prefixCls, "-icon-arrow-focus"), visible), _classNames));
272
272
  var iconShow = allowClear && !disabled && currentOptions.length > 0;
273
273
  var clearIconCls = classNames(_defineProperty({}, "".concat(prefixCls, "-icon-clear"), true));
274
- return /*#__PURE__*/React.createElement(React.Fragment, null, iconShow && /*#__PURE__*/React.createElement("span", {
274
+ return /*#__PURE__*/React.createElement(React.Fragment, null, iconShow ? /*#__PURE__*/React.createElement("span", {
275
275
  onClick: handleClear,
276
276
  className: clearIconCls
277
277
  }, /*#__PURE__*/React.createElement(Icon, {
278
278
  type: "close-solid"
279
- }) || clearIcon), /*#__PURE__*/React.createElement("span", {
279
+ }) || clearIcon) : null, /*#__PURE__*/React.createElement("span", {
280
280
  className: arrowIconCls
281
281
  }, suffixIcon || /*#__PURE__*/React.createElement(Icon, {
282
282
  type: "arrow-down"
@@ -316,11 +316,11 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
316
316
  }), /*#__PURE__*/React.createElement("div", {
317
317
  className: "".concat(prefixCls, "-multiple-wrapper"),
318
318
  ref: wrapperRef
319
- }, Array.isArray(currentOptions) && /*#__PURE__*/React.createElement(React.Fragment, null, _mapInstanceProperty(currentOptions).call(currentOptions, function (option, index) {
319
+ }, Array.isArray(currentOptions) ? /*#__PURE__*/React.createElement(React.Fragment, null, _mapInstanceProperty(currentOptions).call(currentOptions, function (option, index) {
320
320
  return /*#__PURE__*/React.createElement("span", {
321
321
  key: _JSON$stringify(values[index]),
322
322
  className: classNames("".concat(prefixCls, "-selection-tag"))
323
- }, (!maxTagCount || index <= maxTagCount - 1) && /*#__PURE__*/React.createElement(Tag, {
323
+ }, !maxTagCount || index <= maxTagCount - 1 ? /*#__PURE__*/React.createElement(Tag, {
324
324
  type: "edit",
325
325
  disabled: disabled,
326
326
  style: TagStyle,
@@ -328,14 +328,14 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
328
328
  onClose: function onClose(e) {
329
329
  return handleRemove(e, option);
330
330
  }
331
- }, displayRender(labels[index], option)));
331
+ }, displayRender(labels[index], option)) : null);
332
332
  }), maxTagCount && currentOptions.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/React.createElement("span", {
333
333
  className: itemCls
334
334
  }, /*#__PURE__*/React.createElement("span", {
335
335
  className: "".concat(prefixCls, "-tag-describe-content")
336
- }, "\u5171", currentOptions.length, "\u9879")) : null), /*#__PURE__*/React.createElement("span", {
336
+ }, "\u5171", currentOptions.length, "\u9879")) : null) : null, /*#__PURE__*/React.createElement("span", {
337
337
  className: "".concat(prefixCls, "-placeholder")
338
- }, !currentOptions.length && placeholder)), /*#__PURE__*/React.createElement("span", {
338
+ }, !currentOptions.length ? placeholder : null)), /*#__PURE__*/React.createElement("span", {
339
339
  ref: suffixRef,
340
340
  className: "".concat(prefixCls, "-suffix")
341
341
  }, renderSuffix()));
@@ -371,11 +371,11 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
371
371
  ref: wrapperRef
372
372
  }, /*#__PURE__*/React.createElement(Input, _extends({}, inputProps)), /*#__PURE__*/React.createElement("span", {
373
373
  className: "".concat(prefixCls, "-picker-label")
374
- }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear && /*#__PURE__*/React.createElement(Icon, {
374
+ }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear ? /*#__PURE__*/React.createElement(Icon, {
375
375
  type: "close-solid",
376
376
  className: "".concat(prefixCls, "-picker-close"),
377
377
  onClick: handleClear
378
- }))));
378
+ }) : null)));
379
379
  };
380
380
  var cascaderLocator = isMultiple ? renderMultiple() : renderSingle();
381
381
  var onExpend = function onExpend(index, opt, opts) {
@@ -433,11 +433,11 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
433
433
  onPopperVisibleChange && onPopperVisibleChange(v);
434
434
  v && setSelectedOptions(_sliceInstanceProperty(currentOptions).call(currentOptions, 0));
435
435
  };
436
- var cascaderMenus = /*#__PURE__*/React.createElement(React.Fragment, null, (options === null || options === void 0 ? void 0 : options.length) ? (menus === null || menus === void 0 ? void 0 : menus.length) && _mapInstanceProperty(menus).call(menus, function (opts, index) {
436
+ var cascaderMenus = /*#__PURE__*/React.createElement(React.Fragment, null, (options === null || options === void 0 ? void 0 : options.length) ? (menus === null || menus === void 0 ? void 0 : menus.length) ? _mapInstanceProperty(menus).call(menus, function (opts, index) {
437
437
  return /*#__PURE__*/React.createElement("ul", {
438
438
  key: index,
439
439
  className: "".concat(prefixCls, "-menu")
440
- }, (opts === null || opts === void 0 ? void 0 : opts.length) && _mapInstanceProperty(opts).call(opts, function (opt) {
440
+ }, (opts === null || opts === void 0 ? void 0 : opts.length) ? _mapInstanceProperty(opts).call(opts, function (opt) {
441
441
  var isLeaf = opt.isLeaf,
442
442
  loading = opt.loading,
443
443
  value = opt[fieldNames.value],
@@ -461,9 +461,9 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
461
461
  }, label), loading ? /*#__PURE__*/React.createElement(Icon, {
462
462
  type: "loadding-circle",
463
463
  spin: true
464
- }) : ((children === null || children === void 0 ? void 0 : children.length) || isLeaf === false) && (props.expandIcon || /*#__PURE__*/React.createElement(Icon, {
464
+ }) : (children === null || children === void 0 ? void 0 : children.length) || isLeaf === false ? props.expandIcon || /*#__PURE__*/React.createElement(Icon, {
465
465
  type: "arrow-right"
466
- })));
466
+ }) : null);
467
467
  return /*#__PURE__*/React.createElement(CascaderMenuSubmenu, _extends({
468
468
  key: value
469
469
  }, {
@@ -480,8 +480,8 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
480
480
  },
481
481
  className: "".concat(prefixCls, "-checkbox")
482
482
  }), node) : node);
483
- }));
484
- }) : /*#__PURE__*/React.createElement(Empty, {
483
+ }) : null);
484
+ }) : null : /*#__PURE__*/React.createElement(Empty, {
485
485
  description: notFoundContent
486
486
  }));
487
487
  var cascaderPopper = dropdownRender(cascaderMenus);
@@ -330,8 +330,8 @@
330
330
  display: -ms-flexbox;
331
331
  display: flex;
332
332
  -webkit-box-flex: 0;
333
- -ms-flex: 0;
334
- flex: 0;
333
+ -ms-flex: 0 0 auto;
334
+ flex: 0 0 auto;
335
335
  -ms-flex-wrap: wrap;
336
336
  flex-wrap: wrap;
337
337
  -webkit-box-align: center;
@@ -227,7 +227,7 @@
227
227
  right: 0;
228
228
  position: absolute;
229
229
  display: flex;
230
- flex: 0;
230
+ flex: 0 0 auto;
231
231
  flex-wrap: wrap;
232
232
  align-items: center;
233
233
  justify-content: center;
@@ -464,10 +464,6 @@ var InternalSelect = function InternalSelect(props, ref) {
464
464
  var _a;
465
465
  return (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
466
466
  },
467
- onBlur: function onBlur() {
468
- var _a;
469
- return (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.blur();
470
- },
471
467
  onKeyDown: onInternalKeyDown
472
468
  }, renderSingle()));
473
469
  };
@@ -167,6 +167,13 @@
167
167
  z-index: 1;
168
168
  position: absolute;
169
169
  top: 0;
170
+ bottom: 0;
171
+ display: -webkit-box;
172
+ display: -ms-flexbox;
173
+ display: flex;
174
+ -webkit-box-align: center;
175
+ -ms-flex-align: center;
176
+ align-items: center;
170
177
  background: #fff;
171
178
  -webkit-transition: opacity 0.15s ease;
172
179
  transition: opacity 0.15s ease;
@@ -59,6 +59,9 @@
59
59
  z-index: 1;
60
60
  position: absolute;
61
61
  top: 0;
62
+ bottom: 0;
63
+ display: flex;
64
+ align-items: center;
62
65
  background: #fff;
63
66
  transition: opacity 0.15s ease;
64
67
  font-size: @city-picker-clear-font-size;
@@ -140,7 +140,7 @@ function Panel(props) {
140
140
  };
141
141
  var renderDateHeader = function renderDateHeader() {
142
142
  var year = getYear(viewDate);
143
- var month = getMonth(viewDate) + 1;
143
+ var month = getMonth(viewDate);
144
144
  var headerCls = classnames("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
145
145
  return {
146
146
  children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
@@ -149,7 +149,7 @@ function Panel(props) {
149
149
  }, year + locale.year), /*#__PURE__*/React.createElement("span", {
150
150
  className: classnames("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), _defineProperty({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
151
151
  onClick: onHeaderMonthClick
152
- }, month + locale.month)),
152
+ }, locale.monthTitle[month])),
153
153
  className: headerCls
154
154
  };
155
155
  };
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { DateType } from './interface';
2
+ import { DateType, InnerLocale } from './interface';
3
3
  import { PickerPanelBaseProps, PickerPanelDateProps, PickerPanelTimeProps } from './date-panel';
4
4
  import { BorderType, InputSiteType } from '../input/input';
5
5
  export declare type CellRenderSubType = 'hour' | 'minute' | 'second' | '12Hours';
@@ -59,5 +59,6 @@ export interface PickerTimeProps extends PickerSharedProps, Omit<OmitPanelProps<
59
59
  }
60
60
  export declare type PickerProps = PickerBaseProps | PickerDateProps | PickerTimeProps;
61
61
  export declare type IInnerPicker = undefined | 'year' | 'month';
62
+ export declare const mergeDateLocale: (globalLocale: InnerLocale, locale?: {}) => InnerLocale;
62
63
  declare const DatePicker: React.ForwardRefExoticComponent<(Partial<PickerBaseProps> & React.RefAttributes<unknown>) | (Partial<PickerDateProps> & React.RefAttributes<unknown>) | (Partial<PickerTimeProps> & React.RefAttributes<unknown>)>;
63
64
  export default DatePicker;
@@ -1,5 +1,7 @@
1
1
  import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
2
2
  import _extends from "@babel/runtime-corejs3/helpers/extends";
3
+ import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
4
+ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
3
5
  import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
4
6
  import React, { useContext, useEffect, useState } from 'react';
5
7
  import classnames from 'classnames';
@@ -17,6 +19,28 @@ import useTextValueMapping from './hooks/use-text-value-mapping';
17
19
  import getExtraFooter from './utils/get-extra-footer';
18
20
  import getRanges from './utils/get-ranges';
19
21
  import usePopper from '../_utils/usePopper';
22
+ var MONTH_DEFAULT_SUFFIX = '月';
23
+ export var mergeDateLocale = function mergeDateLocale(globalLocale) {
24
+ var locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
25
+ var mergeLocale = _extends({}, globalLocale, locale);
26
+ mergeLocale.weekTitle = _Array$from({
27
+ length: 7
28
+ }, function (_, index) {
29
+ return mergeLocale.weekTitle[index] || globalLocale.weekTitle[index];
30
+ });
31
+ mergeLocale.monthTitle = _Array$from({
32
+ length: 12
33
+ }, function (_, index) {
34
+ return mergeLocale.monthTitle[index] || globalLocale.monthTitle[index];
35
+ });
36
+ if ((mergeLocale === null || mergeLocale === void 0 ? void 0 : mergeLocale.month) && mergeLocale.month !== MONTH_DEFAULT_SUFFIX) {
37
+ var _context;
38
+ mergeLocale.monthTitle = _mapInstanceProperty(_context = mergeLocale.monthTitle).call(_context, function (d) {
39
+ return d.toString().replace(MONTH_DEFAULT_SUFFIX, mergeLocale.month);
40
+ });
41
+ }
42
+ return mergeLocale;
43
+ };
20
44
  var InternalDatePicker = function InternalDatePicker(props, ref) {
21
45
  var customPrefixcls = props.prefixCls;
22
46
  var _useContext = useContext(ConfigContext),
@@ -92,7 +116,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
92
116
  var isMinuteStepValid = 60 % minuteStep === 0;
93
117
  var isSecondStepValid = 60 % secondStep === 0;
94
118
  var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
95
- var datePickerLang = _extends({}, globalLocale.getCompLangMsg({
119
+ var datePickerLang = mergeDateLocale(globalLocale.getCompLangMsg({
96
120
  componentName: 'DatePicker'
97
121
  }), locale || {});
98
122
  var _useMergedState = useMergedState(null, {
@@ -1,5 +1,7 @@
1
1
  /// <reference types="react" />
2
2
  import { BorderType, InputSiteType } from '../input/input';
3
+ export declare type WeekTitleType = [string, string, string, string, string, string, string];
4
+ export declare type MonthTitleType = [string, string, string, string, string, string, string, string, string, string, string, string];
3
5
  export interface Locale {
4
6
  'DatePicker.placeholder': string;
5
7
  'DatePicker.yearPlaceholder': string;
@@ -12,7 +14,8 @@ export interface Locale {
12
14
  'DatePicker.today': string;
13
15
  'DatePicker.year': string;
14
16
  'DatePicker.month': string;
15
- 'DatePicker.weekTitle': [string, string, string, string, string, string, string];
17
+ 'DatePicker.weekTitle': WeekTitleType;
18
+ 'DatePicker.monthTitle': MonthTitleType;
16
19
  'DatePicker.rangePlaceholder': [string, string];
17
20
  'DatePicker.rangeYearPlaceholder': [string, string];
18
21
  'DatePicker.rangeMonthPlaceholder': [string, string];
@@ -33,7 +36,8 @@ export interface InnerLocale {
33
36
  today: string;
34
37
  year: string;
35
38
  month: string;
36
- weekTitle: [string, string, string, string, string, string, string];
39
+ weekTitle: WeekTitleType;
40
+ monthTitle: MonthTitleType;
37
41
  rangePlaceholder: [string, string];
38
42
  rangeYearPlaceholder: [string, string];
39
43
  rangeMonthPlaceholder: [string, string];
@@ -12,28 +12,7 @@ var locale = {
12
12
  'DatePicker.month': '月',
13
13
  'DatePicker.year': '年',
14
14
  'DatePicker.weekTitle': ['日', '一', '二', '三', '四', '五', '六'],
15
- // 'DatePicker.backToToday': '返回今天',
16
- // 'DatePicker.timeSelect': '选择时间',
17
- // 'DatePicker.dateSelect': '选择日期',
18
- // 'DatePicker.weekSelect': '选择周',
19
- // 'DatePicker.clear': '清除',
20
- // 'DatePicker.month': '月',
21
- // 'DatePicker.year': '年',
22
- // 'DatePicker.previousMonth': '上个月 (翻页上键)',
23
- // 'DatePicker.nextMonth': '下个月 (翻页下键)',
24
- // 'DatePicker.monthSelect': '选择月份',
25
- // 'DatePicker.yearSelect': '选择年份',
26
- // 'DatePicker.decadeSelect': '选择年代',
27
- // 'DatePicker.yearFormat': 'YYYY年',
28
- // 'DatePicker.dayFormat': 'D日',
29
- // 'DatePicker.dateFormat': 'YYYY年M月D日',
30
- // 'DatePicker.dateTimeFormat': 'YYYY年M月D日 HH时mm分ss秒',
31
- // 'DatePicker.previousYear': '上一年 (Control键加左方向键)',
32
- // 'DatePicker.nextYear': '下一年 (Control键加右方向键)',
33
- // 'DatePicker.previousDecade': '上一年代',
34
- // 'DatePicker.nextDecade': '下一年代',
35
- // 'DatePicker.previousCentury': '上一世纪',
36
- // 'DatePicker.nextCentury': '下一世纪',
15
+ 'DatePicker.monthTitle': ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
37
16
  'DatePicker.rangePlaceholder': ['开始日期', '结束日期'],
38
17
  'DatePicker.rangeYearPlaceholder': ['开始年份', '结束年份'],
39
18
  'DatePicker.rangeMonthPlaceholder': ['开始月份', '结束月份'],
@@ -1,7 +1,6 @@
1
1
  import _extends from "@babel/runtime-corejs3/helpers/extends";
2
2
  import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
3
3
  import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
4
- import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
5
4
  import React, { useContext } from 'react';
6
5
  import classnames from 'classnames';
7
6
  import { getMonth, newDate, getYear, setMonth, isAfter, isBefore, isSameMonth, getStartOfMonth, setYearOrMonthOfDate } from '../../utils/date-fns';
@@ -98,7 +97,6 @@ function Month(props) {
98
97
  className: monthLineCls,
99
98
  key: i
100
99
  }, _mapInstanceProperty(month).call(month, function (m, j) {
101
- var _context;
102
100
  var month = setMonth(viewDate, m);
103
101
  var _props = {
104
102
  onClick: function onClick() {
@@ -118,7 +116,7 @@ function Month(props) {
118
116
  var monthItemCls = classnames("".concat(prefixCls, "-month-item"), _defineProperty({}, "".concat(prefixCls, "-month-item-disabled"), disabledDate && disabledDate(month)), getRangeCls(month));
119
117
  var originNode = /*#__PURE__*/React.createElement("span", {
120
118
  className: getMonthClassNames(m)
121
- }, _concatInstanceProperty(_context = "".concat(m + 1)).call(_context, locale.month));
119
+ }, "".concat(locale.monthTitle[m]));
122
120
  return /*#__PURE__*/React.createElement("div", _extends({
123
121
  className: monthItemCls,
124
122
  key: j
@@ -1,6 +1,6 @@
1
+ import _extends from "@babel/runtime-corejs3/helpers/extends";
1
2
  import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
2
3
  import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
3
- import _extends from "@babel/runtime-corejs3/helpers/extends";
4
4
  import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
5
5
  import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
6
6
  import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
@@ -19,6 +19,7 @@ import { formatDate, isAfter, newDate, parseDate, isEqual, isSameQuarter, isSame
19
19
  import useTextValueMapping from './hooks/use-text-value-mapping';
20
20
  import useRangeViewDates from './hooks/use-range-view-dates';
21
21
  import useRangeDisabled from './hooks/use-range-disabled';
22
+ import { mergeDateLocale } from './date-picker';
22
23
  import getExtraFooter from './utils/get-extra-footer';
23
24
  import getRanges from './utils/get-ranges';
24
25
  import classNames from 'classnames';
@@ -105,7 +106,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
105
106
  status = datePickerProps.status,
106
107
  cellRender = datePickerProps.cellRender;
107
108
  var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
108
- var datePickerLang = _extends({}, globalLocale.getCompLangMsg({
109
+ var datePickerLang = mergeDateLocale(globalLocale.getCompLangMsg({
109
110
  componentName: 'DatePicker'
110
111
  }), locale || {});
111
112
  // ref
@@ -116,7 +116,8 @@ declare class LocaleCache {
116
116
  'DatePicker.today': string;
117
117
  'DatePicker.year': string;
118
118
  'DatePicker.month': string;
119
- 'DatePicker.weekTitle': [string, string, string, string, string, string, string];
119
+ 'DatePicker.weekTitle': import("../date-picker/interface").WeekTitleType;
120
+ 'DatePicker.monthTitle': import("../date-picker/interface").MonthTitleType;
120
121
  'DatePicker.rangePlaceholder': [string, string];
121
122
  'DatePicker.rangeYearPlaceholder': [string, string];
122
123
  'DatePicker.rangeMonthPlaceholder': [string, string];
@@ -90,7 +90,8 @@ declare const locale: {
90
90
  'DatePicker.today': string;
91
91
  'DatePicker.year': string;
92
92
  'DatePicker.month': string;
93
- 'DatePicker.weekTitle': [string, string, string, string, string, string, string];
93
+ 'DatePicker.weekTitle': import("../date-picker/interface").WeekTitleType;
94
+ 'DatePicker.monthTitle': import("../date-picker/interface").MonthTitleType;
94
95
  'DatePicker.rangePlaceholder': [string, string];
95
96
  'DatePicker.rangeYearPlaceholder': [string, string];
96
97
  'DatePicker.rangeMonthPlaceholder': [string, string];
package/es/modal/modal.js CHANGED
@@ -139,7 +139,9 @@ var InternalModal = function InternalModal(props, ref) {
139
139
  var escapeToCloseModal = useCallback(function (evt) {
140
140
  var _context;
141
141
  // In Internet Explorer 9 and Firefox 36 and earlier, the Esc key returns "Esc" instead of "Escape"
142
- if (_includesInstanceProperty(_context = ['Escape', 'Esc']).call(_context, evt.key)) {
142
+ var isModalVisible = destroyOnClose || (isForceController ? visible : innerVisible);
143
+ if (_includesInstanceProperty(_context = ['Escape', 'Esc']).call(_context, evt.key) && isModalVisible) {
144
+ evt.preventDefault();
143
145
  proxyCloseModal(onCancel);
144
146
  }
145
147
  }, [proxyCloseModal, onCancel]);
@@ -39,7 +39,7 @@ var Popconfirm = function Popconfirm(props) {
39
39
  }, [props.visible]);
40
40
  var confirmLocator = React.Children.count(children) === 1 && children.type ? children : /*#__PURE__*/React.createElement("span", null, children);
41
41
  var confirmTitle = typeof title === 'function' ? title() : title;
42
- var confirmMsg = typeof title === 'function' ? message() : message;
42
+ var confirmMsg = typeof message === 'function' ? message() : message;
43
43
  var handleCancel = function handleCancel(e) {
44
44
  props.visible === undefined && setVisible(false);
45
45
  onVisibleChange && onVisibleChange(false);
@@ -505,7 +505,7 @@ var InternalSelect = function InternalSelect(props, ref) {
505
505
  className: clearIconCls,
506
506
  ref: clearRef
507
507
  }, clearIcon || /*#__PURE__*/React.createElement(Icon, {
508
- type: "close-solid"
508
+ type: "close"
509
509
  })) : null, showArrow ? /*#__PURE__*/React.createElement("span", {
510
510
  className: arrowIconCls
511
511
  }, suffixIcon || /*#__PURE__*/React.createElement(Icon, {
@@ -542,10 +542,10 @@
542
542
  opacity: 1;
543
543
  }
544
544
  .kd-select .kd-select-single .kd-select-icon-clear {
545
- color: var(--kd-c-select-icon-clear-color-text, #d9d9d9);
545
+ color: var(--kd-c-select-icon-clear-color-text, #666);
546
546
  }
547
547
  .kd-select .kd-select-single .kd-select-icon-clear:hover {
548
- color: var(--kd-c-select-icon-clear-color-text-hover, #999);
548
+ color: var(--kd-c-select-icon-clear-color-text-hover, var(--kd-g-color-theme, #5582f3));
549
549
  }
550
550
  .kd-select .kd-select-single-text {
551
551
  color: var(--kd-c-select-single-color-text, var(--kd-g-color-text-primary, #212121));
@@ -660,10 +660,10 @@
660
660
  opacity: 1;
661
661
  }
662
662
  .kd-select-multiple .kd-select-icon-clear {
663
- color: var(--kd-c-select-icon-clear-color-text, #d9d9d9);
663
+ color: var(--kd-c-select-icon-clear-color-text, #666);
664
664
  }
665
665
  .kd-select-multiple .kd-select-icon-clear:hover {
666
- color: var(--kd-c-select-icon-clear-color-text-hover, #999);
666
+ color: var(--kd-c-select-icon-clear-color-text-hover, var(--kd-g-color-theme, #5582f3));
667
667
  }
668
668
  .kd-select-multiple-selector {
669
669
  position: relative;
@@ -20,8 +20,8 @@
20
20
  @select-color-text-disabled: var(~'@{select-custom-prefix}-color-text-disabled', @color-disabled);
21
21
  @select-arrow-icon-color-text-disabled: var(~'@{select-custom-prefix}-arrow-icon-color-text-disabled', #b2b2b2);
22
22
  @select-single-color-text: var(~'@{select-custom-prefix}-single-color-text', @color-text-primary);
23
- @select-clear-color: var(~'@{select-custom-prefix}-icon-clear-color-text', #d9d9d9);
24
- @select-clear-color-hover: var(~'@{select-custom-prefix}-icon-clear-color-text-hover', #999);
23
+ @select-clear-color: var(~'@{select-custom-prefix}-icon-clear-color-text', #666);
24
+ @select-clear-color-hover: var(~'@{select-custom-prefix}-icon-clear-color-text-hover', @color-theme);
25
25
  @select-error-color: var(~'@{select-custom-prefix}-color-error', @color-error);
26
26
 
27
27
  // font
@@ -284,12 +284,12 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
284
284
  var arrowIconCls = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-icon-arrow"), true), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-icon-arrow-up"), visible), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-icon-arrow-down"), !visible), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-icon-arrow-focus"), visible), _classNames));
285
285
  var iconShow = allowClear && !disabled && currentOptions.length > 0;
286
286
  var clearIconCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(prefixCls, "-icon-clear"), true));
287
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow && /*#__PURE__*/_react.default.createElement("span", {
287
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow ? /*#__PURE__*/_react.default.createElement("span", {
288
288
  onClick: handleClear,
289
289
  className: clearIconCls
290
290
  }, /*#__PURE__*/_react.default.createElement(_icon.default, {
291
291
  type: "close-solid"
292
- }) || clearIcon), /*#__PURE__*/_react.default.createElement("span", {
292
+ }) || clearIcon) : null, /*#__PURE__*/_react.default.createElement("span", {
293
293
  className: arrowIconCls
294
294
  }, suffixIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
295
295
  type: "arrow-down"
@@ -329,11 +329,11 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
329
329
  }), /*#__PURE__*/_react.default.createElement("div", {
330
330
  className: "".concat(prefixCls, "-multiple-wrapper"),
331
331
  ref: wrapperRef
332
- }, Array.isArray(currentOptions) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _map.default)(currentOptions).call(currentOptions, function (option, index) {
332
+ }, Array.isArray(currentOptions) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _map.default)(currentOptions).call(currentOptions, function (option, index) {
333
333
  return /*#__PURE__*/_react.default.createElement("span", {
334
334
  key: (0, _stringify.default)(values[index]),
335
335
  className: (0, _classnames.default)("".concat(prefixCls, "-selection-tag"))
336
- }, (!maxTagCount || index <= maxTagCount - 1) && /*#__PURE__*/_react.default.createElement(_tag.default, {
336
+ }, !maxTagCount || index <= maxTagCount - 1 ? /*#__PURE__*/_react.default.createElement(_tag.default, {
337
337
  type: "edit",
338
338
  disabled: disabled,
339
339
  style: TagStyle,
@@ -341,14 +341,14 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
341
341
  onClose: function onClose(e) {
342
342
  return handleRemove(e, option);
343
343
  }
344
- }, displayRender(labels[index], option)));
344
+ }, displayRender(labels[index], option)) : null);
345
345
  }), maxTagCount && currentOptions.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/_react.default.createElement("span", {
346
346
  className: itemCls
347
347
  }, /*#__PURE__*/_react.default.createElement("span", {
348
348
  className: "".concat(prefixCls, "-tag-describe-content")
349
- }, "\u5171", currentOptions.length, "\u9879")) : null), /*#__PURE__*/_react.default.createElement("span", {
349
+ }, "\u5171", currentOptions.length, "\u9879")) : null) : null, /*#__PURE__*/_react.default.createElement("span", {
350
350
  className: "".concat(prefixCls, "-placeholder")
351
- }, !currentOptions.length && placeholder)), /*#__PURE__*/_react.default.createElement("span", {
351
+ }, !currentOptions.length ? placeholder : null)), /*#__PURE__*/_react.default.createElement("span", {
352
352
  ref: suffixRef,
353
353
  className: "".concat(prefixCls, "-suffix")
354
354
  }, renderSuffix()));
@@ -384,11 +384,11 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
384
384
  ref: wrapperRef
385
385
  }, /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({}, inputProps)), /*#__PURE__*/_react.default.createElement("span", {
386
386
  className: "".concat(prefixCls, "-picker-label")
387
- }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear && /*#__PURE__*/_react.default.createElement(_icon.default, {
387
+ }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear ? /*#__PURE__*/_react.default.createElement(_icon.default, {
388
388
  type: "close-solid",
389
389
  className: "".concat(prefixCls, "-picker-close"),
390
390
  onClick: handleClear
391
- }))));
391
+ }) : null)));
392
392
  };
393
393
  var cascaderLocator = isMultiple ? renderMultiple() : renderSingle();
394
394
  var onExpend = function onExpend(index, opt, opts) {
@@ -446,11 +446,11 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
446
446
  onPopperVisibleChange && onPopperVisibleChange(v);
447
447
  v && setSelectedOptions((0, _slice.default)(currentOptions).call(currentOptions, 0));
448
448
  };
449
- 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) {
449
+ 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) {
450
450
  return /*#__PURE__*/_react.default.createElement("ul", {
451
451
  key: index,
452
452
  className: "".concat(prefixCls, "-menu")
453
- }, (opts === null || opts === void 0 ? void 0 : opts.length) && (0, _map.default)(opts).call(opts, function (opt) {
453
+ }, (opts === null || opts === void 0 ? void 0 : opts.length) ? (0, _map.default)(opts).call(opts, function (opt) {
454
454
  var isLeaf = opt.isLeaf,
455
455
  loading = opt.loading,
456
456
  value = opt[fieldNames.value],
@@ -474,9 +474,9 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
474
474
  }, label), loading ? /*#__PURE__*/_react.default.createElement(_icon.default, {
475
475
  type: "loadding-circle",
476
476
  spin: true
477
- }) : ((children === null || children === void 0 ? void 0 : children.length) || isLeaf === false) && (props.expandIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
477
+ }) : (children === null || children === void 0 ? void 0 : children.length) || isLeaf === false ? props.expandIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
478
478
  type: "arrow-right"
479
- })));
479
+ }) : null);
480
480
  return /*#__PURE__*/_react.default.createElement(CascaderMenuSubmenu, (0, _extends2.default)({
481
481
  key: value
482
482
  }, {
@@ -493,8 +493,8 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
493
493
  },
494
494
  className: "".concat(prefixCls, "-checkbox")
495
495
  }), node) : node);
496
- }));
497
- }) : /*#__PURE__*/_react.default.createElement(_empty.default, {
496
+ }) : null);
497
+ }) : null : /*#__PURE__*/_react.default.createElement(_empty.default, {
498
498
  description: notFoundContent
499
499
  }));
500
500
  var cascaderPopper = dropdownRender(cascaderMenus);
@@ -330,8 +330,8 @@
330
330
  display: -ms-flexbox;
331
331
  display: flex;
332
332
  -webkit-box-flex: 0;
333
- -ms-flex: 0;
334
- flex: 0;
333
+ -ms-flex: 0 0 auto;
334
+ flex: 0 0 auto;
335
335
  -ms-flex-wrap: wrap;
336
336
  flex-wrap: wrap;
337
337
  -webkit-box-align: center;
@@ -227,7 +227,7 @@
227
227
  right: 0;
228
228
  position: absolute;
229
229
  display: flex;
230
- flex: 0;
230
+ flex: 0 0 auto;
231
231
  flex-wrap: wrap;
232
232
  align-items: center;
233
233
  justify-content: center;
@@ -476,10 +476,6 @@ var InternalSelect = function InternalSelect(props, ref) {
476
476
  var _a;
477
477
  return (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
478
478
  },
479
- onBlur: function onBlur() {
480
- var _a;
481
- return (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.blur();
482
- },
483
479
  onKeyDown: onInternalKeyDown
484
480
  }, renderSingle()));
485
481
  };
@@ -167,6 +167,13 @@
167
167
  z-index: 1;
168
168
  position: absolute;
169
169
  top: 0;
170
+ bottom: 0;
171
+ display: -webkit-box;
172
+ display: -ms-flexbox;
173
+ display: flex;
174
+ -webkit-box-align: center;
175
+ -ms-flex-align: center;
176
+ align-items: center;
170
177
  background: #fff;
171
178
  -webkit-transition: opacity 0.15s ease;
172
179
  transition: opacity 0.15s ease;
@@ -59,6 +59,9 @@
59
59
  z-index: 1;
60
60
  position: absolute;
61
61
  top: 0;
62
+ bottom: 0;
63
+ display: flex;
64
+ align-items: center;
62
65
  background: #fff;
63
66
  transition: opacity 0.15s ease;
64
67
  font-size: @city-picker-clear-font-size;
@@ -152,7 +152,7 @@ function Panel(props) {
152
152
  };
153
153
  var renderDateHeader = function renderDateHeader() {
154
154
  var year = (0, _dateFns.getYear)(viewDate);
155
- var month = (0, _dateFns.getMonth)(viewDate) + 1;
155
+ var month = (0, _dateFns.getMonth)(viewDate);
156
156
  var headerCls = (0, _classnames4.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
157
157
  return {
158
158
  children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
@@ -161,7 +161,7 @@ function Panel(props) {
161
161
  }, year + locale.year), /*#__PURE__*/_react.default.createElement("span", {
162
162
  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)),
163
163
  onClick: onHeaderMonthClick
164
- }, month + locale.month)),
164
+ }, locale.monthTitle[month])),
165
165
  className: headerCls
166
166
  };
167
167
  };