@kdcloudjs/kdesign 1.6.26 → 1.6.28

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 (76) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/kdesign-complete.less +70 -7
  3. package/dist/kdesign.css +11 -7
  4. package/dist/kdesign.css.map +1 -1
  5. package/dist/kdesign.js +1701 -187
  6. package/dist/kdesign.js.map +1 -1
  7. package/dist/kdesign.min.css +3 -3
  8. package/dist/kdesign.min.js +8 -8
  9. package/dist/kdesign.min.js.map +1 -1
  10. package/es/_utils/numberUtil.js +1 -3
  11. package/es/config-provider/compDefaultProps.d.ts +1 -0
  12. package/es/config-provider/compDefaultProps.js +2 -1
  13. package/es/date-picker/date-panel.js +5 -2
  14. package/es/date-picker/date-picker.js +29 -26
  15. package/es/date-picker/range/input-range.js +2 -4
  16. package/es/date-picker/range-picker.d.ts +1 -0
  17. package/es/date-picker/range-picker.js +2 -0
  18. package/es/date-picker/single/input-date.js +2 -4
  19. package/es/date-picker/style/index.css +4 -3
  20. package/es/date-picker/style/index.less +6 -2
  21. package/es/dropdown/dropdown.js +8 -3
  22. package/es/form/Field.js +21 -25
  23. package/es/image/preview-group.js +6 -4
  24. package/es/image/preview.js +2 -1
  25. package/es/input/ClearableLabeledInput.d.ts +1 -0
  26. package/es/input/ClearableLabeledInput.js +9 -4
  27. package/es/input/TextArea.js +18 -4
  28. package/es/input/input.d.ts +1 -0
  29. package/es/input/input.js +47 -10
  30. package/es/input/style/index.css +3 -0
  31. package/es/input/style/index.less +47 -0
  32. package/es/input-number/inputNumber.d.ts +1 -0
  33. package/es/input-number/inputNumber.js +4 -3
  34. package/es/pagination/pagination.d.ts +10 -0
  35. package/es/pagination/pagination.js +44 -45
  36. package/es/pagination/style/index.css +3 -3
  37. package/es/pagination/style/index.less +17 -5
  38. package/es/radio/index.js +1 -0
  39. package/es/select/interface.d.ts +8 -0
  40. package/es/select/select.js +32 -22
  41. package/es/upload/interface.d.ts +1 -0
  42. package/es/upload/upload.js +11 -6
  43. package/lib/_utils/numberUtil.js +1 -3
  44. package/lib/config-provider/compDefaultProps.d.ts +1 -0
  45. package/lib/config-provider/compDefaultProps.js +2 -1
  46. package/lib/date-picker/date-panel.js +11 -7
  47. package/lib/date-picker/date-picker.js +31 -26
  48. package/lib/date-picker/range/input-range.js +2 -4
  49. package/lib/date-picker/range-picker.d.ts +1 -0
  50. package/lib/date-picker/range-picker.js +2 -0
  51. package/lib/date-picker/single/input-date.js +2 -4
  52. package/lib/date-picker/style/index.css +4 -3
  53. package/lib/date-picker/style/index.less +6 -2
  54. package/lib/dropdown/dropdown.js +8 -3
  55. package/lib/form/Field.js +22 -27
  56. package/lib/image/preview-group.js +6 -4
  57. package/lib/image/preview.js +3 -1
  58. package/lib/input/ClearableLabeledInput.d.ts +1 -0
  59. package/lib/input/ClearableLabeledInput.js +9 -4
  60. package/lib/input/TextArea.js +18 -4
  61. package/lib/input/input.d.ts +1 -0
  62. package/lib/input/input.js +46 -9
  63. package/lib/input/style/index.css +3 -0
  64. package/lib/input/style/index.less +47 -0
  65. package/lib/input-number/inputNumber.d.ts +1 -0
  66. package/lib/input-number/inputNumber.js +4 -3
  67. package/lib/pagination/pagination.d.ts +10 -0
  68. package/lib/pagination/pagination.js +44 -46
  69. package/lib/pagination/style/index.css +3 -3
  70. package/lib/pagination/style/index.less +17 -5
  71. package/lib/radio/index.js +1 -0
  72. package/lib/select/interface.d.ts +8 -0
  73. package/lib/select/select.js +32 -22
  74. package/lib/upload/interface.d.ts +1 -0
  75. package/lib/upload/upload.js +11 -6
  76. package/package.json +1 -1
@@ -60,7 +60,8 @@ var InternalSelect = function InternalSelect(props, ref) {
60
60
  optionFilterProp = selectProps.optionFilterProp,
61
61
  optionLabelProp = selectProps.optionLabelProp,
62
62
  _selectProps$popperSt = selectProps.popperStyle,
63
- popperStyle = _selectProps$popperSt === void 0 ? {} : _selectProps$popperSt;
63
+ popperStyle = _selectProps$popperSt === void 0 ? {} : _selectProps$popperSt,
64
+ tagRender = selectProps.tagRender;
64
65
  var isMultiple = mode === 'multiple'; // 是否多选
65
66
 
66
67
  var _useMergedState = useMergedState(undefined, {
@@ -410,26 +411,28 @@ var InternalSelect = function InternalSelect(props, ref) {
410
411
  selectedVal = _multipleRef$current3.selectedVal,
411
412
  selectMulOpts = _multipleRef$current3.selectMulOpts;
412
413
 
413
- if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
414
- _mapInstanceProperty(filledOptions).call(filledOptions, function (child) {
415
- var _ref = child.props || child,
416
- value = _ref.value;
417
-
418
- if (!_includesInstanceProperty(selectedVal).call(selectedVal, value)) {
419
- selectedVal.push(value);
420
- selectMulOpts.push({
421
- value: value,
422
- label: getOptionLabel(child)
423
- });
424
- }
425
- });
414
+ if (!('value' in selectProps)) {
415
+ if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
416
+ _mapInstanceProperty(filledOptions).call(filledOptions, function (child) {
417
+ var _ref = child.props || child,
418
+ value = _ref.value;
419
+
420
+ if (!_includesInstanceProperty(selectedVal).call(selectedVal, value)) {
421
+ selectedVal.push(value);
422
+ selectMulOpts.push({
423
+ value: value,
424
+ label: getOptionLabel(child)
425
+ });
426
+ }
427
+ });
426
428
 
427
- setMulOptions(_toConsumableArray(selectMulOpts));
428
- setSearchValue('');
429
- } else {
430
- multipleRef.current.selectedVal = selectedVal = [];
431
- multipleRef.current.selectMulOpts = selectMulOpts = [];
432
- setMulOptions([]);
429
+ setMulOptions(_toConsumableArray(selectMulOpts));
430
+ setSearchValue('');
431
+ } else {
432
+ multipleRef.current.selectedVal = selectedVal = [];
433
+ multipleRef.current.selectMulOpts = selectMulOpts = [];
434
+ setMulOptions([]);
435
+ }
433
436
  }
434
437
 
435
438
  onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
@@ -461,6 +464,7 @@ var InternalSelect = function InternalSelect(props, ref) {
461
464
  }
462
465
 
463
466
  onClear && onClear('');
467
+ setSearchValue('');
464
468
  onChange && onChange(isMultiple ? '' : undefined);
465
469
  }; // 多选模式下清除某一项
466
470
 
@@ -489,7 +493,7 @@ var InternalSelect = function InternalSelect(props, ref) {
489
493
  var selectedVal = multipleRef.current.selectedVal; // 选择器下拉icon样式
490
494
 
491
495
  var arrowIconCls = classNames((_classNames7 = {}, _defineProperty(_classNames7, "".concat(selectPrefixCls, "-icon-arrow"), true), _defineProperty(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), _defineProperty(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), _defineProperty(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames7));
492
- var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '');
496
+ var iconShow = allowClear && !disabled && ((isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '') || searchValue);
493
497
  var clearIconCls = classNames(_defineProperty({}, "".concat(selectPrefixCls, "-icon-clear"), true));
494
498
  return /*#__PURE__*/React.createElement(React.Fragment, null, iconShow && /*#__PURE__*/React.createElement("span", {
495
499
  onClick: handleReset,
@@ -684,7 +688,13 @@ var InternalSelect = function InternalSelect(props, ref) {
684
688
  onMouseDown: function onMouseDown(e) {
685
689
  return e.preventDefault();
686
690
  }
687
- }, /*#__PURE__*/React.createElement(Tag, {
691
+ }, typeof tagRender === 'function' ? tagRender === null || tagRender === void 0 ? void 0 : tagRender({
692
+ onClose: handleRemove,
693
+ value: value,
694
+ label: label,
695
+ disabled: disabled,
696
+ size: size
697
+ }) : /*#__PURE__*/React.createElement(Tag, {
688
698
  type: "edit",
689
699
  style: TagStyle,
690
700
  size: size,
@@ -145,6 +145,7 @@ export interface IFileItem {
145
145
  file: UploadFile;
146
146
  prefixCls: string;
147
147
  listType: string;
148
+ disabled: boolean;
148
149
  handleReUpload: (file: UploadFile, e: React.MouseEvent) => void;
149
150
  handleRemove: (file: UploadFile, e: React.MouseEvent) => void;
150
151
  }
@@ -149,7 +149,9 @@ var InternalUpload = function InternalUpload(props, ref) {
149
149
  var _context2;
150
150
 
151
151
  files.forEach(function (file) {
152
- file.originFileObj = new File([file], file.type);
152
+ file.originFileObj = new File([file], file.name, {
153
+ type: file.type
154
+ });
153
155
  file.uid = getUid();
154
156
  file.status = 'notStart';
155
157
  file.fileName = allProps.name || file.name;
@@ -460,7 +462,8 @@ var InternalUpload = function InternalUpload(props, ref) {
460
462
  prefixCls: prefixCls,
461
463
  listType: listType,
462
464
  handleReUpload: handleReUpload,
463
- handleRemove: handleRemove
465
+ handleRemove: handleRemove,
466
+ disabled: disabled
464
467
  })), file, setFileList) : /*#__PURE__*/React.createElement(Item, _extends({
465
468
  key: file.uid
466
469
  }, {
@@ -468,7 +471,8 @@ var InternalUpload = function InternalUpload(props, ref) {
468
471
  prefixCls: prefixCls,
469
472
  listType: listType,
470
473
  handleReUpload: handleReUpload,
471
- handleRemove: handleRemove
474
+ handleRemove: handleRemove,
475
+ disabled: disabled
472
476
  }));
473
477
  })));
474
478
  };
@@ -480,7 +484,8 @@ var Item = function Item(_ref3) {
480
484
  prefixCls = _ref3.prefixCls,
481
485
  listType = _ref3.listType,
482
486
  handleReUpload = _ref3.handleReUpload,
483
- handleRemove = _ref3.handleRemove;
487
+ handleRemove = _ref3.handleRemove,
488
+ disabled = _ref3.disabled;
484
489
  var mapStatus = {
485
490
  uploading: 'loadding',
486
491
  error: 'warning-solid',
@@ -508,7 +513,7 @@ var Item = function Item(_ref3) {
508
513
  href: "true",
509
514
  className: _concatInstanceProperty(_context13 = "".concat(prefixCls, "-")).call(_context13, listType, "-list-item-reupload"),
510
515
  onClick: handleReUpload.bind(_this, file)
511
- }, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/React.createElement("a", {
516
+ }, "\u91CD\u65B0\u4E0A\u4F20"), !disabled && /*#__PURE__*/React.createElement("a", {
512
517
  href: "true",
513
518
  className: _concatInstanceProperty(_context14 = "".concat(prefixCls, "-")).call(_context14, listType, "-list-item-delete"),
514
519
  onClick: handleRemove.bind(_this, file)
@@ -527,7 +532,7 @@ var Item = function Item(_ref3) {
527
532
  style: {
528
533
  verticalAlign: 'top'
529
534
  }
530
- }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", {
535
+ }), "\u4E0A\u4F20\u5931\u8D25"), !disabled && /*#__PURE__*/React.createElement("div", {
531
536
  className: _concatInstanceProperty(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-action")
532
537
  }, /*#__PURE__*/React.createElement("a", {
533
538
  href: "true",
@@ -167,9 +167,7 @@ function getMaxNumberByPrecision(integerPrecision, decimalPrecision) {
167
167
 
168
168
 
169
169
  function isExp(number) {
170
- number = Number(number);
171
- if (isNaN(number) || !isFinite(number)) return false;
172
- return /^(?!-0(\.0+)?(e|$))-?(0|[1-9]\d*)(\.\d+)?(e-?(0|[1-9]\d*))?$/i.test(number.toString());
170
+ return /\d+\.?\d*e[+-]*\d+/i.test(number.toString());
173
171
  }
174
172
  /**
175
173
  * 将科学计数法显示的数字格式化为正常浮点数
@@ -155,6 +155,7 @@ declare const compDefaultProps: {
155
155
  mask: string;
156
156
  mustInScope: boolean;
157
157
  mustInPrecisionScope: boolean;
158
+ numberMode: boolean;
158
159
  };
159
160
  Layout: {};
160
161
  Modal: {
@@ -178,7 +178,8 @@ var compDefaultProps = {
178
178
  showDecimalTailZero: false,
179
179
  mask: '',
180
180
  mustInScope: false,
181
- mustInPrecisionScope: true
181
+ mustInPrecisionScope: true,
182
+ numberMode: false
182
183
  },
183
184
  Layout: {},
184
185
  Modal: {
@@ -13,11 +13,13 @@ Object.defineProperty(exports, "__esModule", {
13
13
  });
14
14
  exports.default = void 0;
15
15
 
16
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
17
+
16
18
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
17
19
 
18
20
  var _react = _interopRequireWildcard(require("react"));
19
21
 
20
- var _classnames = _interopRequireDefault(require("classnames"));
22
+ var _classnames3 = _interopRequireDefault(require("classnames"));
21
23
 
22
24
  var _month = _interopRequireDefault(require("./panel/month/month"));
23
25
 
@@ -149,7 +151,7 @@ function Panel(props) {
149
151
  startPeriod = _getYearsPeriod.startPeriod,
150
152
  endPeriod = _getYearsPeriod.endPeriod;
151
153
 
152
- var headerCls = (0, _classnames.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-year"));
154
+ var headerCls = (0, _classnames3.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-year"));
153
155
  return {
154
156
  children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, startPeriod, " - ", endPeriod),
155
157
  className: headerCls
@@ -158,7 +160,7 @@ function Panel(props) {
158
160
 
159
161
  var renderMonthHeader = function renderMonthHeader() {
160
162
  var year = (0, _dateFns.getYear)(viewDate);
161
- var headerCls = (0, _classnames.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"));
163
+ var headerCls = (0, _classnames3.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"));
162
164
  return {
163
165
  children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, year + locale.year),
164
166
  className: headerCls
@@ -178,15 +180,17 @@ function Panel(props) {
178
180
  };
179
181
 
180
182
  var renderDateHeader = function renderDateHeader() {
183
+ var _classnames, _classnames2;
184
+
181
185
  var year = (0, _dateFns.getYear)(viewDate);
182
186
  var month = (0, _dateFns.getMonth)(viewDate) + 1;
183
- var headerCls = (0, _classnames.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
187
+ var headerCls = (0, _classnames3.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
184
188
  return {
185
189
  children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
186
- className: "".concat(prefixCls, "-header-text-inner"),
190
+ className: (0, _classnames3.default)("".concat(prefixCls, "-header-text-inner"), (_classnames = {}, (0, _defineProperty2.default)(_classnames, "".concat(prefixCls, "-header-text-inner-active"), innerPicker === 'year'), (0, _defineProperty2.default)(_classnames, "".concat(prefixCls, "-header-text-inner-hover"), picker === 'date'), _classnames)),
187
191
  onClick: onHeaderYearClick
188
192
  }, year + locale.year), /*#__PURE__*/_react.default.createElement("span", {
189
- className: "".concat(prefixCls, "-header-text-inner"),
193
+ className: (0, _classnames3.default)("".concat(prefixCls, "-header-text-inner"), (_classnames2 = {}, (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-header-text-inner-active"), innerPicker === 'month'), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-header-text-inner-hover"), picker === 'date'), _classnames2)),
190
194
  onClick: onHeaderMonthClick
191
195
  }, month + locale.month)),
192
196
  className: headerCls
@@ -324,7 +328,7 @@ function Panel(props) {
324
328
  }
325
329
 
326
330
  var showHeader = !(picker === 'date' && showTime || picker === 'time');
327
- var containerCls = (0, _classnames.default)("".concat(prefixCls, "-warpper"));
331
+ var containerCls = (0, _classnames3.default)("".concat(prefixCls, "-warpper"));
328
332
  return /*#__PURE__*/_react.default.createElement("div", {
329
333
  className: containerCls
330
334
  }, showHeader ? getHeader() : null, panel);
@@ -124,9 +124,13 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
124
124
 
125
125
  var panelDivRef = _react.default.useRef(null);
126
126
 
127
- var inputDivRef = ref || /*#__PURE__*/_react.default.createRef();
127
+ var inputDivRefDefault = _react.default.useRef(null);
128
128
 
129
- var popperRef = popupRef || /*#__PURE__*/_react.default.createRef();
129
+ var inputDivRef = ref || inputDivRefDefault;
130
+
131
+ var popperRefDefault = _react.default.useRef(null);
132
+
133
+ var popperRef = popupRef || popperRefDefault;
130
134
 
131
135
  var inputRef = _react.default.useRef(null);
132
136
 
@@ -185,17 +189,18 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
185
189
  var _format = (0, _utils2.getDefaultFormat)(format, picker, showTime && !disabledTimePanel, use12Hours); // 面板展示日期
186
190
 
187
191
 
188
- var _useMergedState3 = (0, _hooks.useMergedState)(null, {
189
- // value: pickerValue,
190
- defaultValue: defaultPickerValue || dateValue,
191
- postState: function postState(date) {
192
- return date || (0, _dateFns.newDate)();
193
- }
194
- }),
195
- _useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
196
- viewDate = _useMergedState4[0],
197
- setViewDate = _useMergedState4[1]; // text
192
+ var _useState = (0, _react.useState)(defaultPickerValue || dateValue || new Date()),
193
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
194
+ viewDate = _useState2[0],
195
+ setInnerViewDate = _useState2[1];
198
196
 
197
+ var setViewDate = function setViewDate(date) {
198
+ setInnerViewDate(date || new Date());
199
+ };
200
+
201
+ (0, _react.useEffect)(function () {
202
+ setViewDate(dateValue);
203
+ }, [dateValue]); // text
199
204
 
200
205
  var valueText = (0, _useValueTexts.default)(selectedValue, {
201
206
  format: _format
@@ -235,7 +240,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
235
240
  onEnter = _useHoverValue2[1],
236
241
  onLeave = _useHoverValue2[2];
237
242
 
238
- var _useMergedState5 = (0, _hooks.useMergedState)(false, {
243
+ var _useMergedState3 = (0, _hooks.useMergedState)(false, {
239
244
  value: open,
240
245
  defaultValue: defaultOpen,
241
246
  postState: function postState(postOpen) {
@@ -250,12 +255,12 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
250
255
 
251
256
  }
252
257
  }),
253
- _useMergedState6 = (0, _slicedToArray2.default)(_useMergedState5, 2),
254
- openValue = _useMergedState6[0],
255
- triggerInnerOpen = _useMergedState6[1]; // Save panel is changed from which panel
258
+ _useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
259
+ openValue = _useMergedState4[0],
260
+ triggerInnerOpen = _useMergedState4[1]; // Save panel is changed from which panel
256
261
 
257
262
 
258
- var _useMergedState7 = (0, _hooks.useMergedState)(function () {
263
+ var _useMergedState5 = (0, _hooks.useMergedState)(function () {
259
264
  if (picker === 'time') {
260
265
  return 'time';
261
266
  }
@@ -264,14 +269,14 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
264
269
  }, {
265
270
  value: mode
266
271
  }),
267
- _useMergedState8 = (0, _slicedToArray2.default)(_useMergedState7, 2),
268
- mergedMode = _useMergedState8[0],
269
- setInnerMode = _useMergedState8[1];
272
+ _useMergedState6 = (0, _slicedToArray2.default)(_useMergedState5, 2),
273
+ mergedMode = _useMergedState6[0],
274
+ setInnerMode = _useMergedState6[1];
270
275
 
271
- var _useState = (0, _react.useState)(undefined),
272
- _useState2 = (0, _slicedToArray2.default)(_useState, 2),
273
- innerPicker = _useState2[0],
274
- setInnerPicker = _useState2[1];
276
+ var _useState3 = (0, _react.useState)(undefined),
277
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
278
+ innerPicker = _useState4[0],
279
+ setInnerPicker = _useState4[1];
275
280
 
276
281
  (0, _react.useEffect)(function () {
277
282
  setInnerMode(picker);
@@ -399,7 +404,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
399
404
  onChange: setSelectedValue
400
405
  }); // 渲染日期选择表盘
401
406
 
402
- function renderPanel() {
407
+ var renderPanel = function renderPanel() {
403
408
  var panelNode = /*#__PURE__*/_react.default.createElement(_datePanel.default, (0, _extends2.default)({}, panelProps));
404
409
 
405
410
  if (panelRender) {
@@ -430,7 +435,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
430
435
  }, panelNode, (extraFooter || rangesNode || todayNode) && innerPicker === undefined ? /*#__PURE__*/_react.default.createElement("div", {
431
436
  className: "".concat(datePickerPrefixCls, "-footer")
432
437
  }, extraFooter, rangesNode, todayNode) : null);
433
- }
438
+ };
434
439
 
435
440
  var inputProps = {
436
441
  inputRef: inputRef,
@@ -137,12 +137,10 @@ function InputDate(props, ref) {
137
137
 
138
138
  if (allowClear && ((0, _utils.getValue)(dateValue, 0) && !mergedDisabled[0] || (0, _utils.getValue)(dateValue, 1) && !mergedDisabled[1])) {
139
139
  clearNode = /*#__PURE__*/_react.default.createElement("span", {
140
- onMouseDown: function onMouseDown(e) {
141
- e.preventDefault();
140
+ onMouseUp: function onMouseUp(e) {
142
141
  e.stopPropagation();
143
142
  },
144
- onMouseUp: function onMouseUp(e) {
145
- e.preventDefault();
143
+ onClick: function onClick(e) {
146
144
  e.stopPropagation();
147
145
  var values = dateValue;
148
146
 
@@ -18,6 +18,7 @@ export interface RangePickerSharedProps {
18
18
  separator?: React.ReactNode;
19
19
  allowEmpty?: [boolean, boolean];
20
20
  suffixIcon?: React.ReactNode;
21
+ clearIcon?: React.ReactNode;
21
22
  mode?: [PanelMode, PanelMode];
22
23
  onChange?: (values: RangeValue, formatString: [string | null, string | null]) => void;
23
24
  onCalendarChange?: (values: RangeValue, formatString: [string | null, string | null], info: RangeInfo) => void;
@@ -149,6 +149,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
149
149
  _datePickerProps$seco = datePickerProps.secondStep,
150
150
  secondStep = _datePickerProps$seco === void 0 ? 1 : _datePickerProps$seco,
151
151
  suffixIcon = datePickerProps.suffixIcon,
152
+ clearIcon = datePickerProps.clearIcon,
152
153
  panelRender = datePickerProps.panelRender,
153
154
  renderExtraFooter = datePickerProps.renderExtraFooter,
154
155
  disabledHours = datePickerProps.disabledHours,
@@ -750,6 +751,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
750
751
  endOpen: endOpen,
751
752
  needConfirmButton: needConfirmButton,
752
753
  suffixIcon: suffixIcon,
754
+ clearIcon: clearIcon,
753
755
  format: _format,
754
756
  open: mergedOpen,
755
757
  readOnly: inputReadOnly,
@@ -118,12 +118,10 @@ function InputDate(props, ref) {
118
118
 
119
119
  if (allowClear && dateValue && !disabled) {
120
120
  clearNode = /*#__PURE__*/_react.default.createElement("span", {
121
- onMouseDown: function onMouseDown(e) {
122
- e.preventDefault();
121
+ onMouseUp: function onMouseUp(e) {
123
122
  e.stopPropagation();
124
123
  },
125
- onMouseUp: function onMouseUp(e) {
126
- e.preventDefault();
124
+ onClick: function onClick(e) {
127
125
  e.stopPropagation();
128
126
  triggerChange(null);
129
127
  triggerOpen(false);
@@ -745,11 +745,12 @@
745
745
  -ms-flex: 1;
746
746
  flex: 1;
747
747
  }
748
- .kd-date-picker-panel .kd-date-picker-header-text-inner {
749
- cursor: pointer;
748
+ .kd-date-picker-panel .kd-date-picker-header-text-inner-active {
749
+ color: var(--kd-c-date-picker-color-background-checked, var(--kd-g-color-theme, #5582f3));
750
750
  }
751
- .kd-date-picker-panel .kd-date-picker-header-text-inner:hover {
751
+ .kd-date-picker-panel .kd-date-picker-header-text-inner-hover:hover {
752
752
  color: var(--kd-c-date-picker-color-background-checked, var(--kd-g-color-theme, #5582f3));
753
+ cursor: pointer;
753
754
  }
754
755
  .kd-date-picker-panel .kd-date-picker-header-text-inner:nth-child(2) {
755
756
  margin-left: 13px;
@@ -629,11 +629,15 @@
629
629
  flex: 1;
630
630
 
631
631
  &-inner {
632
- cursor: pointer;
632
+ &-active {
633
+ color: @date-color-background-checked;
634
+ }
633
635
 
634
- &:hover {
636
+ &-hover:hover {
635
637
  color: @date-color-background-checked;
638
+ cursor: pointer;
636
639
  }
640
+
637
641
  &:nth-child(2) {
638
642
  margin-left: 13px;
639
643
  }
@@ -46,7 +46,7 @@ var findItem = function findItem(element) {
46
46
  };
47
47
 
48
48
  var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
49
- var _a, _b, _c;
49
+ var _a, _b, _c, _d;
50
50
 
51
51
  var _React$useContext = React.useContext(_ConfigContext.default),
52
52
  getPrefixCls = _React$useContext.getPrefixCls,
@@ -110,11 +110,16 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
110
110
  }
111
111
  };
112
112
 
113
- var menuElement = isMenu ? /*#__PURE__*/React.cloneElement(menu, {
113
+ var cloneObj = /*#__PURE__*/React.cloneElement(menu, {
114
114
  selectedKey: selectedKey,
115
115
  onClick: handleItemClick,
116
116
  selectable: menuSelectable
117
- }) : /*#__PURE__*/React.createElement("ul", {
117
+ });
118
+ var menuElement = isMenu ? Array.isArray((_d = menu.props) === null || _d === void 0 ? void 0 : _d.children) ? cloneObj : /*#__PURE__*/React.createElement("ul", {
119
+ className: "".concat(prefixCls, "-menu"),
120
+ onClick: handleItemClick,
121
+ role: "menu"
122
+ }, menu.props.children) : /*#__PURE__*/React.createElement("ul", {
118
123
  className: "".concat(prefixCls, "-menu"),
119
124
  onClick: handleItemClick,
120
125
  role: "menu"
package/lib/form/Field.js CHANGED
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", {
13
13
  });
14
14
  exports.default = void 0;
15
15
 
16
- var _extends5 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
16
+ var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
17
17
 
18
18
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
19
19
 
@@ -273,11 +273,15 @@ var Field = function Field(props) {
273
273
  var validateMessage = getFieldError(name);
274
274
 
275
275
  var getInputValueFormProp = function getInputValueFormProp(evt) {
276
+ var payload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
277
+
276
278
  var _a;
277
279
 
278
280
  var inputValue;
279
281
 
280
- if (Object.prototype.hasOwnProperty.call(evt, 'target') && (0, _includes.default)(FormEventValuePropNames).call(FormEventValuePropNames, innerValuePropName)) {
282
+ if (innerDisplayName === 'RadioGroup' && payload) {
283
+ inputValue = payload[1];
284
+ } else if (Object.prototype.hasOwnProperty.call(evt, 'target') && (0, _includes.default)(FormEventValuePropNames).call(FormEventValuePropNames, innerValuePropName)) {
281
285
  inputValue = (_a = evt.target) === null || _a === void 0 ? void 0 : _a[innerValuePropName];
282
286
  } else {
283
287
  inputValue = evt;
@@ -286,15 +290,6 @@ var Field = function Field(props) {
286
290
  return inputValue;
287
291
  };
288
292
 
289
- var handleValueChange = _react.default.useCallback(function (evt) {
290
- var inputValue = getInputValueFormProp(evt);
291
- dispatch({
292
- type: 'updateValue',
293
- namePath: name,
294
- value: inputValue
295
- });
296
- }, [name]);
297
-
298
293
  var handleValueValidate = _react.default.useCallback(function () {
299
294
  dispatch({
300
295
  type: 'validateField',
@@ -302,18 +297,14 @@ var Field = function Field(props) {
302
297
  });
303
298
  }, [name]);
304
299
 
305
- var trigger = (0, _extends5.default)((0, _defineProperty2.default)({}, DEFAULT_TRIGGER, handleValueChange), generateEventHandler(handleValueValidate, validateTrigger));
306
-
307
300
  var mergeProps = function mergeProps(fa, ch) {
308
- var _extends3;
301
+ var _extends2;
309
302
 
310
303
  if (!ch) {
311
304
  return {};
312
305
  }
313
306
 
314
- var faChange = fa.onChange,
315
- faDisabled = fa.disabled,
316
- faRest = __rest(fa, ["onChange", "disabled"]);
307
+ var faRest = __rest(fa, []);
317
308
 
318
309
  var _ch$props = ch.props,
319
310
  chChange = _ch$props.onChange,
@@ -322,16 +313,22 @@ var Field = function Field(props) {
322
313
  chDefaultValue = _ch$props.defaultValue;
323
314
 
324
315
  var onChange = function onChange() {
325
- if (chValue === undefined) {
326
- setFieldValue(getInputValueFormProp(arguments.length <= 0 ? undefined : arguments[0]));
316
+ for (var _len = arguments.length, evt = new Array(_len), _key = 0; _key < _len; _key++) {
317
+ evt[_key] = arguments[_key];
327
318
  }
328
319
 
329
- if (typeof faChange === 'function') {
330
- faChange.apply(void 0, arguments);
320
+ if (chValue === undefined) {
321
+ var iv = getInputValueFormProp(evt[0], evt);
322
+ setFieldValue(iv);
323
+ dispatch({
324
+ type: 'updateValue',
325
+ namePath: name,
326
+ value: iv
327
+ });
331
328
  }
332
329
 
333
330
  if (typeof chChange === 'function') {
334
- chChange.apply(void 0, arguments);
331
+ chChange.apply(void 0, evt);
335
332
  }
336
333
  };
337
334
 
@@ -346,10 +343,10 @@ var Field = function Field(props) {
346
343
  forceUpdate();
347
344
  }
348
345
 
349
- var mergeResult = (0, _extends5.default)((0, _extends5.default)({}, faRest), (_extends3 = {
346
+ var mergeResult = (0, _extends3.default)((0, _extends3.default)({}, faRest), (_extends2 = {
350
347
  onChange: onChange,
351
348
  defaultValue: defaultValue
352
- }, (0, _defineProperty2.default)(_extends3, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled !== undefined ? chDisabled : faDisabled !== undefined ? faDisabled : formDisabled), _extends3));
349
+ }, (0, _defineProperty2.default)(_extends2, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends2, "disabled", chDisabled !== undefined ? chDisabled : disabled !== undefined ? disabled : formDisabled), _extends2));
353
350
  var mergeEventArray = [];
354
351
 
355
352
  if (validateTrigger) {
@@ -390,9 +387,7 @@ var Field = function Field(props) {
390
387
  width: wrapperWidth,
391
388
  validateMessage: validateMessage
392
389
  }, (0, _map.default)(childrenArray).call(childrenArray, function (child, index) {
393
- var keys = mergeProps((0, _extends5.default)((0, _extends5.default)((0, _defineProperty2.default)({
394
- disabled: disabled
395
- }, innerValuePropName, value), trigger), {
390
+ var keys = mergeProps((0, _extends3.default)((0, _extends3.default)({}, generateEventHandler(handleValueValidate, validateTrigger)), {
396
391
  key: index,
397
392
  id: customizeHtmlFor ? undefined : htmlFor
398
393
  }), child);
@@ -40,18 +40,18 @@ var PreviewGroup = function PreviewGroup(_ref) {
40
40
  var images = React.useMemo(function () {
41
41
  var _context;
42
42
 
43
- return React.Children.count(children) > 1 ? (0, _map.default)(_context = (0, _filter.default)(children).call(children, function (image) {
43
+ return Array.isArray(children) ? (0, _map.default)(_context = (0, _filter.default)(children).call(children, function (image) {
44
44
  return image.props.src;
45
45
  })).call(_context, function (image) {
46
46
  return image.props;
47
- }) : [children ? children.props : {}];
47
+ }) : [children !== undefined ? children.props : {}];
48
48
  }, [children]); // eslint-disable-next-line react-hooks/rules-of-hooks
49
49
 
50
50
  var refs = (0, _map.default)(images).call(images, function () {
51
51
  return React.useRef();
52
52
  });
53
53
 
54
- var _React$useState = React.useState(images[0]),
54
+ var _React$useState = React.useState(images[0] || {}),
55
55
  _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
56
56
  image = _React$useState2[0],
57
57
  setImage = _React$useState2[1];
@@ -70,7 +70,9 @@ var PreviewGroup = function PreviewGroup(_ref) {
70
70
  exit && setVisible(true);
71
71
  }, [exit]);
72
72
  React.useEffect(function () {
73
- setImage(images[current]);
73
+ if (images[current]) {
74
+ setImage(images[current]);
75
+ }
74
76
  }, [current, images]);
75
77
 
76
78
  var _React$useState7 = React.useState(false),
@@ -35,6 +35,8 @@ var _icon = _interopRequireDefault(require("../icon"));
35
35
 
36
36
  var _throttle = _interopRequireDefault(require("lodash/throttle"));
37
37
 
38
+ var _findLast = _interopRequireDefault(require("lodash/findLast"));
39
+
38
40
  var _reactDraggable = _interopRequireDefault(require("react-draggable"));
39
41
 
40
42
  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); }
@@ -120,7 +122,7 @@ var Preview = function Preview(props) {
120
122
  }, [show, scale]);
121
123
 
122
124
  var handleZoomOut = function handleZoomOut() {
123
- var nextScale = scales.findLast(function (s) {
125
+ var nextScale = (0, _findLast.default)(scales, function (s) {
124
126
  return s / 100 < scale;
125
127
  });
126
128
  if (nextScale !== undefined) setScale(nextScale / 100);