@kdcloudjs/kdesign 1.7.57 → 1.7.59

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.
@@ -113,6 +113,7 @@ var getRealDom = function getRealDom(locatorRef, locatorElement) {
113
113
  var name = REF_NAME_OBJ[(_a = locatorElement === null || locatorElement === void 0 ? void 0 : locatorElement.type) === null || _a === void 0 ? void 0 : _a.displayName];
114
114
  return locatorRef === null || locatorRef === void 0 ? void 0 : locatorRef.current[name];
115
115
  };
116
+ var DEFAULT_PLACEMENT = 'top';
116
117
  function usePopper(locatorElement, popperElement, props) {
117
118
  var _context3, _context4, _arrowStyle;
118
119
  var prefixCls = props.prefixCls,
@@ -131,7 +132,7 @@ function usePopper(locatorElement, popperElement, props) {
131
132
  _props$trigger = props.trigger,
132
133
  trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
133
134
  _props$placement = props.placement,
134
- placement = _props$placement === void 0 ? 'top' : _props$placement,
135
+ placement = _props$placement === void 0 ? DEFAULT_PLACEMENT : _props$placement,
135
136
  _props$gap = props.gap,
136
137
  defaultGap = _props$gap === void 0 ? 4 : _props$gap,
137
138
  _props$scrollHidden = props.scrollHidden,
@@ -228,10 +229,15 @@ function usePopper(locatorElement, popperElement, props) {
228
229
  _useState16 = _slicedToArray(_useState15, 2),
229
230
  align = _useState16[0],
230
231
  setAlign = _useState16[1];
231
- var _useState17 = useState(placement),
232
+ var _useState17 = useState(_includesInstanceProperty(Placements).call(Placements, placement) ? placement : DEFAULT_PLACEMENT),
232
233
  _useState18 = _slicedToArray(_useState17, 2),
233
234
  nextPlacement = _useState18[0],
234
235
  setNextPlacement = _useState18[1];
236
+ useEffect(function () {
237
+ if (nextPlacement !== placement && _includesInstanceProperty(Placements).call(Placements, placement)) {
238
+ setNextPlacement(placement);
239
+ }
240
+ }, [placement]);
235
241
  var alignPopper = useCallback(function () {
236
242
  var realDom = getRealDom(locatorRef, locatorElement);
237
243
  if (realDom && (popperRef === null || popperRef === void 0 ? void 0 : popperRef.current)) {
@@ -245,6 +251,10 @@ function usePopper(locatorElement, popperElement, props) {
245
251
  right = _realDom$getBoundingC.right,
246
252
  height = _realDom$getBoundingC.height,
247
253
  width = _realDom$getBoundingC.width;
254
+ if (height === 0 && width === 0) {
255
+ hidePopper();
256
+ return;
257
+ }
248
258
  var _getOffsetPos = getOffsetPos(container),
249
259
  containerTop = _getOffsetPos.top,
250
260
  containerLeft = _getOffsetPos.left;
@@ -415,7 +425,7 @@ function usePopper(locatorElement, popperElement, props) {
415
425
  setArrowPos(_arrowPos);
416
426
  setNextPlacement(currentPlacement);
417
427
  }
418
- }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top]);
428
+ }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top, nextPlacement]);
419
429
  useEffect(function () {
420
430
  if (canAlign) {
421
431
  alignPopper();
@@ -540,13 +550,9 @@ function usePopper(locatorElement, popperElement, props) {
540
550
  }, 10);
541
551
  window.addEventListener('resize', alignPopper);
542
552
  document.addEventListener('scroll', scrollAlign, true);
543
- locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.addEventListener('DOMSubtreeModified', alignPopper);
544
- exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('DOMSubtreeModified', alignPopper));
545
553
  return function () {
546
554
  window.removeEventListener('resize', alignPopper);
547
555
  document.removeEventListener('scroll', scrollAlign, true);
548
- locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.removeEventListener('DOMSubtreeModified', alignPopper);
549
- exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('DOMSubtreeModified', alignPopper));
550
556
  };
551
557
  }
552
558
  }, [alignPopper, exist, onVisibleChange, popperNode, props.visible, scrollHidden, locatorNode, visible, popperRef]);
@@ -150,7 +150,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
150
150
  if (newText === '') {
151
151
  triggerChange(null);
152
152
  setViewDate(null);
153
- } else if (newText && newText.length === _format.length) {
153
+ } else if (newText && newText.length >= _format.length) {
154
154
  var inputTempDate = parseDate(newText, _format);
155
155
  if (inputTempDate && (!disabledDate || !disabledDate(inputTempDate))) {
156
156
  if (picker !== 'year') {
@@ -29,8 +29,6 @@ export default function usePickerInput(_ref) {
29
29
  },
30
30
  onKeyDown: function onKeyDown(e) {
31
31
  var _context;
32
- setTyping(true);
33
- triggerOpen(true);
34
32
  switch (e.which) {
35
33
  case KeyCode.ENTER:
36
34
  {
@@ -46,8 +44,9 @@ export default function usePickerInput(_ref) {
46
44
  {
47
45
  if (typing && open && !e.shiftKey) {
48
46
  setTyping(false);
49
- e.preventDefault();
47
+ // e.preventDefault()
50
48
  }
49
+
51
50
  return;
52
51
  }
53
52
  case KeyCode.ESC:
@@ -6,7 +6,7 @@ import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
6
6
  import * as React from 'react';
7
7
  import classNames from 'classnames';
8
8
  import TimeColumn from './time-column';
9
- import { formatDate, newDate, setTime as utilSetTime } from '../../utils/date-fns';
9
+ import { formatDate, newDate, setTime as utilSetTime, isValid } from '../../utils/date-fns';
10
10
  import Context from '../../context';
11
11
  import useStateMemo from '../../hooks/use-state-memo';
12
12
  import { leftPad } from '../../utils';
@@ -39,7 +39,9 @@ function TimePanel(props) {
39
39
  minutes = _context$minutes === void 0 ? [] : _context$minutes,
40
40
  _context$seconds = context.seconds,
41
41
  seconds = _context$seconds === void 0 ? [] : _context$seconds,
42
- disabledTimePanel = context.disabledTimePanel;
42
+ disabledTimePanel = context.disabledTimePanel,
43
+ rangeValue = context.rangeValue,
44
+ panelPosition = context.panelPosition;
43
45
  var picker = props.picker,
44
46
  _props$format = props.format,
45
47
  format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
@@ -72,9 +74,22 @@ function TimePanel(props) {
72
74
  var hour = originHour;
73
75
  // const minute = value ? getMinutes(value) : -1
74
76
  // const second = value ? getSeconds(value) : -1
77
+ var getDefaultDate = function getDefaultDate() {
78
+ if (panelPosition) {
79
+ if (rangeValue && rangeValue[0] && isValid(rangeValue[0])) {
80
+ return rangeValue[0];
81
+ }
82
+ if (rangeValue && rangeValue[1] && isValid(rangeValue[1])) {
83
+ return rangeValue[1];
84
+ }
85
+ } else if (value && isValid(value)) {
86
+ return value;
87
+ }
88
+ return newDate();
89
+ };
75
90
  var setTime = function setTime(isPM, newHour, newMinute, newSecond) {
76
91
  var _a, _b, _c;
77
- var date = value || newDate();
92
+ var date = getDefaultDate();
78
93
  var _hour = newHour > -1 ? newHour : (_a = _findInstanceProperty(rawHours).call(rawHours, function (n) {
79
94
  return !n.disabled;
80
95
  })) === null || _a === void 0 ? void 0 : _a.value;
@@ -30,14 +30,6 @@ function reorderValues(values) {
30
30
  }
31
31
  return values;
32
32
  }
33
- // 范围时间顺序错误时报错
34
- function isErrorValues(values) {
35
- if (values && values[0] && values[1] && isAfter(values[0], values[1])) {
36
- console.error('开始日期在结束日期之后');
37
- return true;
38
- }
39
- return false;
40
- }
41
33
  // 是否可以切换选择器
42
34
  function canValueTrigger(value, index, disabled, allowEmpty) {
43
35
  if (value) {
@@ -145,17 +137,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
145
137
  // 原始数据
146
138
  var _useMergedState3 = useMergedState(null, {
147
139
  value: value,
148
- defaultValue: defaultValue,
149
- postState: function postState(values) {
150
- if (picker === 'time' || picker === 'date' && showTime) {
151
- return order ? reorderValues(values) : values;
152
- } else {
153
- if (isErrorValues(values)) {
154
- return [values[0], null];
155
- }
156
- return values;
157
- }
158
- }
140
+ defaultValue: defaultValue
159
141
  }),
160
142
  _useMergedState4 = _slicedToArray(_useMergedState3, 2),
161
143
  dateValue = _useMergedState4[0],
@@ -229,7 +211,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
229
211
  var inputTempDate;
230
212
  if (newText === '') {
231
213
  triggerChange(updateValues(selectedValue, null, index), index);
232
- } else if (newText && newText.length === _format.length) {
214
+ } else if (newText && newText.length >= _format.length) {
233
215
  inputTempDate = parseDate(newText, _format);
234
216
  var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
235
217
  if (inputTempDate && (!disabledFunc || !disabledFunc(inputTempDate))) {
@@ -352,12 +334,20 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
352
334
  }
353
335
  }, 0);
354
336
  };
337
+ var triggerChangeInner = function triggerChangeInner(values) {
338
+ if (typeof value === 'undefined') {
339
+ setInnerValue(values);
340
+ }
341
+ if (onChange && (!isEqual(getValue(dateValue, 0), getValue(values, 0)) || !isEqual(getValue(dateValue, 1), getValue(values, 1)))) {
342
+ onChange(values, [values && values[0] ? formatDate(values[0], _format) : '', values && values[1] ? formatDate(values[1], _format) : '']);
343
+ }
344
+ };
355
345
  var triggerChange = function triggerChange(newValue, sourceIndex) {
356
346
  var values = newValue;
357
347
  var startValue = getValue(values, 0);
358
348
  var endValue = getValue(values, 1);
359
349
  if (startValue && endValue && isAfter(startValue, endValue)) {
360
- if (picker === 'week' && !isSameWeek(startValue, endValue) || picker === 'quarter' && !isSameQuarter(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !isSameDay(startValue, endValue)) {
350
+ if (picker === 'week' && !isSameWeek(startValue, endValue) || picker === 'quarter' && !isSameQuarter(startValue, endValue) || picker === 'time' && !isEqual(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !isSameDay(startValue, endValue)) {
361
351
  if (sourceIndex === 0) {
362
352
  values = [startValue, null];
363
353
  endValue = null;
@@ -366,8 +356,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
366
356
  values = [null, endValue];
367
357
  }
368
358
  openRecordsRef.current = _defineProperty({}, sourceIndex, true);
369
- } else if (picker === 'time' && order === true) {
370
- values = reorderValues(values);
371
359
  }
372
360
  }
373
361
  setSelectedValue(values);
@@ -383,11 +371,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
383
371
  var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
384
372
  var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
385
373
  if (canTrigger) {
386
- if (typeof value === 'undefined') {
387
- setInnerValue(values);
388
- }
389
- if (onChange && (!isEqual(getValue(dateValue, 0), startValue) || !isEqual(getValue(dateValue, 1), endValue))) {
390
- onChange(values, [startStr, endStr]);
374
+ if (order) {
375
+ triggerChangeInner(reorderValues(values));
376
+ } else {
377
+ triggerChangeInner(values);
391
378
  }
392
379
  }
393
380
  var curValue = getValue(values, sourceIndex);
@@ -236,7 +236,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
236
236
  }
237
237
  onClear === null || onClear === void 0 ? void 0 : onClear('');
238
238
  setSearchValue('');
239
- onChange === null || onChange === void 0 ? void 0 : onChange(undefined, undefined);
239
+ isMultiple ? onChange === null || onChange === void 0 ? void 0 : onChange('', '') : onChange === null || onChange === void 0 ? void 0 : onChange(undefined, undefined);
240
240
  };
241
241
  // 多选模式下清除某一项
242
242
  var handleRemove = function handleRemove(e, key) {
@@ -127,6 +127,7 @@ var getRealDom = function getRealDom(locatorRef, locatorElement) {
127
127
  var name = REF_NAME_OBJ[(_a = locatorElement === null || locatorElement === void 0 ? void 0 : locatorElement.type) === null || _a === void 0 ? void 0 : _a.displayName];
128
128
  return locatorRef === null || locatorRef === void 0 ? void 0 : locatorRef.current[name];
129
129
  };
130
+ var DEFAULT_PLACEMENT = 'top';
130
131
  function usePopper(locatorElement, popperElement, props) {
131
132
  var _context3, _context4, _arrowStyle;
132
133
  var prefixCls = props.prefixCls,
@@ -145,7 +146,7 @@ function usePopper(locatorElement, popperElement, props) {
145
146
  _props$trigger = props.trigger,
146
147
  trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
147
148
  _props$placement = props.placement,
148
- placement = _props$placement === void 0 ? 'top' : _props$placement,
149
+ placement = _props$placement === void 0 ? DEFAULT_PLACEMENT : _props$placement,
149
150
  _props$gap = props.gap,
150
151
  defaultGap = _props$gap === void 0 ? 4 : _props$gap,
151
152
  _props$scrollHidden = props.scrollHidden,
@@ -242,10 +243,15 @@ function usePopper(locatorElement, popperElement, props) {
242
243
  _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
243
244
  align = _useState16[0],
244
245
  setAlign = _useState16[1];
245
- var _useState17 = (0, _react.useState)(placement),
246
+ var _useState17 = (0, _react.useState)((0, _includes.default)(Placements).call(Placements, placement) ? placement : DEFAULT_PLACEMENT),
246
247
  _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
247
248
  nextPlacement = _useState18[0],
248
249
  setNextPlacement = _useState18[1];
250
+ (0, _react.useEffect)(function () {
251
+ if (nextPlacement !== placement && (0, _includes.default)(Placements).call(Placements, placement)) {
252
+ setNextPlacement(placement);
253
+ }
254
+ }, [placement]);
249
255
  var alignPopper = (0, _react.useCallback)(function () {
250
256
  var realDom = getRealDom(locatorRef, locatorElement);
251
257
  if (realDom && (popperRef === null || popperRef === void 0 ? void 0 : popperRef.current)) {
@@ -259,6 +265,10 @@ function usePopper(locatorElement, popperElement, props) {
259
265
  right = _realDom$getBoundingC.right,
260
266
  height = _realDom$getBoundingC.height,
261
267
  width = _realDom$getBoundingC.width;
268
+ if (height === 0 && width === 0) {
269
+ hidePopper();
270
+ return;
271
+ }
262
272
  var _getOffsetPos = getOffsetPos(container),
263
273
  containerTop = _getOffsetPos.top,
264
274
  containerLeft = _getOffsetPos.left;
@@ -429,7 +439,7 @@ function usePopper(locatorElement, popperElement, props) {
429
439
  setArrowPos(_arrowPos);
430
440
  setNextPlacement(currentPlacement);
431
441
  }
432
- }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top]);
442
+ }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top, nextPlacement]);
433
443
  (0, _react.useEffect)(function () {
434
444
  if (canAlign) {
435
445
  alignPopper();
@@ -554,13 +564,9 @@ function usePopper(locatorElement, popperElement, props) {
554
564
  }, 10);
555
565
  window.addEventListener('resize', alignPopper);
556
566
  document.addEventListener('scroll', scrollAlign, true);
557
- locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.addEventListener('DOMSubtreeModified', alignPopper);
558
- exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('DOMSubtreeModified', alignPopper));
559
567
  return function () {
560
568
  window.removeEventListener('resize', alignPopper);
561
569
  document.removeEventListener('scroll', scrollAlign, true);
562
- locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.removeEventListener('DOMSubtreeModified', alignPopper);
563
- exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('DOMSubtreeModified', alignPopper));
564
570
  };
565
571
  }
566
572
  }, [alignPopper, exist, onVisibleChange, popperNode, props.visible, scrollHidden, locatorNode, visible, popperRef]);
@@ -162,7 +162,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
162
162
  if (newText === '') {
163
163
  triggerChange(null);
164
164
  setViewDate(null);
165
- } else if (newText && newText.length === _format.length) {
165
+ } else if (newText && newText.length >= _format.length) {
166
166
  var inputTempDate = (0, _dateFns.parseDate)(newText, _format);
167
167
  if (inputTempDate && (!disabledDate || !disabledDate(inputTempDate))) {
168
168
  if (picker !== 'year') {
@@ -36,8 +36,6 @@ function usePickerInput(_ref) {
36
36
  },
37
37
  onKeyDown: function onKeyDown(e) {
38
38
  var _context;
39
- setTyping(true);
40
- triggerOpen(true);
41
39
  switch (e.which) {
42
40
  case _KeyCode.default.ENTER:
43
41
  {
@@ -53,8 +51,9 @@ function usePickerInput(_ref) {
53
51
  {
54
52
  if (typing && open && !e.shiftKey) {
55
53
  setTyping(false);
56
- e.preventDefault();
54
+ // e.preventDefault()
57
55
  }
56
+
58
57
  return;
59
58
  }
60
59
  case _KeyCode.default.ESC:
@@ -51,7 +51,9 @@ function TimePanel(props) {
51
51
  minutes = _context$minutes === void 0 ? [] : _context$minutes,
52
52
  _context$seconds = context.seconds,
53
53
  seconds = _context$seconds === void 0 ? [] : _context$seconds,
54
- disabledTimePanel = context.disabledTimePanel;
54
+ disabledTimePanel = context.disabledTimePanel,
55
+ rangeValue = context.rangeValue,
56
+ panelPosition = context.panelPosition;
55
57
  var picker = props.picker,
56
58
  _props$format = props.format,
57
59
  format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
@@ -84,9 +86,22 @@ function TimePanel(props) {
84
86
  var hour = originHour;
85
87
  // const minute = value ? getMinutes(value) : -1
86
88
  // const second = value ? getSeconds(value) : -1
89
+ var getDefaultDate = function getDefaultDate() {
90
+ if (panelPosition) {
91
+ if (rangeValue && rangeValue[0] && (0, _dateFns.isValid)(rangeValue[0])) {
92
+ return rangeValue[0];
93
+ }
94
+ if (rangeValue && rangeValue[1] && (0, _dateFns.isValid)(rangeValue[1])) {
95
+ return rangeValue[1];
96
+ }
97
+ } else if (value && (0, _dateFns.isValid)(value)) {
98
+ return value;
99
+ }
100
+ return (0, _dateFns.newDate)();
101
+ };
87
102
  var setTime = function setTime(isPM, newHour, newMinute, newSecond) {
88
103
  var _a, _b, _c;
89
- var date = value || (0, _dateFns.newDate)();
104
+ var date = getDefaultDate();
90
105
  var _hour = newHour > -1 ? newHour : (_a = (0, _find.default)(rawHours).call(rawHours, function (n) {
91
106
  return !n.disabled;
92
107
  })) === null || _a === void 0 ? void 0 : _a.value;
@@ -42,14 +42,6 @@ function reorderValues(values) {
42
42
  }
43
43
  return values;
44
44
  }
45
- // 范围时间顺序错误时报错
46
- function isErrorValues(values) {
47
- if (values && values[0] && values[1] && (0, _dateFns.isAfter)(values[0], values[1])) {
48
- console.error('开始日期在结束日期之后');
49
- return true;
50
- }
51
- return false;
52
- }
53
45
  // 是否可以切换选择器
54
46
  function canValueTrigger(value, index, disabled, allowEmpty) {
55
47
  if (value) {
@@ -157,17 +149,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
157
149
  // 原始数据
158
150
  var _useMergedState3 = (0, _hooks.useMergedState)(null, {
159
151
  value: value,
160
- defaultValue: defaultValue,
161
- postState: function postState(values) {
162
- if (picker === 'time' || picker === 'date' && showTime) {
163
- return order ? reorderValues(values) : values;
164
- } else {
165
- if (isErrorValues(values)) {
166
- return [values[0], null];
167
- }
168
- return values;
169
- }
170
- }
152
+ defaultValue: defaultValue
171
153
  }),
172
154
  _useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
173
155
  dateValue = _useMergedState4[0],
@@ -241,7 +223,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
241
223
  var inputTempDate;
242
224
  if (newText === '') {
243
225
  triggerChange((0, _utils2.updateValues)(selectedValue, null, index), index);
244
- } else if (newText && newText.length === _format.length) {
226
+ } else if (newText && newText.length >= _format.length) {
245
227
  inputTempDate = (0, _dateFns.parseDate)(newText, _format);
246
228
  var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
247
229
  if (inputTempDate && (!disabledFunc || !disabledFunc(inputTempDate))) {
@@ -364,12 +346,20 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
364
346
  }
365
347
  }, 0);
366
348
  };
349
+ var triggerChangeInner = function triggerChangeInner(values) {
350
+ if (typeof value === 'undefined') {
351
+ setInnerValue(values);
352
+ }
353
+ if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), (0, _utils2.getValue)(values, 0)) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), (0, _utils2.getValue)(values, 1)))) {
354
+ onChange(values, [values && values[0] ? (0, _dateFns.formatDate)(values[0], _format) : '', values && values[1] ? (0, _dateFns.formatDate)(values[1], _format) : '']);
355
+ }
356
+ };
367
357
  var triggerChange = function triggerChange(newValue, sourceIndex) {
368
358
  var values = newValue;
369
359
  var startValue = (0, _utils2.getValue)(values, 0);
370
360
  var endValue = (0, _utils2.getValue)(values, 1);
371
361
  if (startValue && endValue && (0, _dateFns.isAfter)(startValue, endValue)) {
372
- if (picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
362
+ if (picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || picker === 'time' && !(0, _dateFns.isEqual)(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
373
363
  if (sourceIndex === 0) {
374
364
  values = [startValue, null];
375
365
  endValue = null;
@@ -378,8 +368,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
378
368
  values = [null, endValue];
379
369
  }
380
370
  openRecordsRef.current = (0, _defineProperty2.default)({}, sourceIndex, true);
381
- } else if (picker === 'time' && order === true) {
382
- values = reorderValues(values);
383
371
  }
384
372
  }
385
373
  setSelectedValue(values);
@@ -395,11 +383,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
395
383
  var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
396
384
  var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
397
385
  if (canTrigger) {
398
- if (typeof value === 'undefined') {
399
- setInnerValue(values);
400
- }
401
- if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), startValue) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), endValue))) {
402
- onChange(values, [startStr, endStr]);
386
+ if (order) {
387
+ triggerChangeInner(reorderValues(values));
388
+ } else {
389
+ triggerChangeInner(values);
403
390
  }
404
391
  }
405
392
  var curValue = (0, _utils2.getValue)(values, sourceIndex);
@@ -248,7 +248,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
248
248
  }
249
249
  onClear === null || onClear === void 0 ? void 0 : onClear('');
250
250
  setSearchValue('');
251
- onChange === null || onChange === void 0 ? void 0 : onChange(undefined, undefined);
251
+ isMultiple ? onChange === null || onChange === void 0 ? void 0 : onChange('', '') : onChange === null || onChange === void 0 ? void 0 : onChange(undefined, undefined);
252
252
  };
253
253
  // 多选模式下清除某一项
254
254
  var handleRemove = function handleRemove(e, key) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/kdesign",
3
- "version": "1.7.57",
3
+ "version": "1.7.59",
4
4
  "description": "KDesign 金蝶前端react 组件库",
5
5
  "title": "kdesign",
6
6
  "keywords": [