@kdcloudjs/kdesign 1.6.28 → 1.6.30
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.
- package/CHANGELOG.md +37 -0
- package/dist/kdesign-complete.less +3 -3
- package/dist/kdesign.css +5 -4
- package/dist/kdesign.css.map +1 -1
- package/dist/kdesign.js +128 -101
- package/dist/kdesign.js.map +1 -1
- package/dist/kdesign.min.css +2 -2
- package/dist/kdesign.min.js +2 -2
- package/dist/kdesign.min.js.map +1 -1
- package/es/_utils/usePopper.js +16 -7
- package/es/cascader/style/index.css +1 -1
- package/es/cascader/style/index.less +1 -1
- package/es/date-picker/date-panel.js +1 -1
- package/es/date-picker/date-picker.js +5 -5
- package/es/date-picker/hooks/use-picker-input.js +0 -4
- package/es/date-picker/style/index.css +3 -2
- package/es/date-picker/style/index.less +2 -2
- package/es/form/Field.js +8 -6
- package/es/input/ClearableLabeledInput.d.ts +1 -0
- package/es/input/ClearableLabeledInput.js +4 -3
- package/es/input/input.js +6 -1
- package/es/input-number/inputNumber.js +24 -11
- package/es/tree/tree.js +6 -3
- package/es/tree/treeHooks.js +5 -9
- package/es/tree/utils/treeUtils.d.ts +1 -1
- package/es/tree/utils/treeUtils.js +17 -14
- package/es/upload/upload.js +1 -1
- package/lib/_utils/usePopper.js +16 -7
- package/lib/cascader/style/index.css +1 -1
- package/lib/cascader/style/index.less +1 -1
- package/lib/date-picker/date-panel.js +1 -1
- package/lib/date-picker/date-picker.js +5 -5
- package/lib/date-picker/hooks/use-picker-input.js +0 -4
- package/lib/date-picker/style/index.css +3 -2
- package/lib/date-picker/style/index.less +2 -2
- package/lib/form/Field.js +8 -6
- package/lib/input/ClearableLabeledInput.d.ts +1 -0
- package/lib/input/ClearableLabeledInput.js +4 -3
- package/lib/input/input.js +6 -1
- package/lib/input-number/inputNumber.js +24 -11
- package/lib/tree/tree.js +6 -3
- package/lib/tree/treeHooks.js +4 -9
- package/lib/tree/utils/treeUtils.d.ts +1 -1
- package/lib/tree/utils/treeUtils.js +17 -14
- package/lib/upload/upload.js +1 -1
- package/package.json +1 -1
package/es/_utils/usePopper.js
CHANGED
|
@@ -524,18 +524,18 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
524
524
|
useEffect(function () {
|
|
525
525
|
if (exist && visible) {
|
|
526
526
|
var mouseleaveTimer;
|
|
527
|
+
var triggerNode = getTriggerElement(locatorRef.current);
|
|
527
528
|
|
|
528
529
|
var handleHidePopper = function handleHidePopper(e) {
|
|
529
|
-
var triggerNode = getTriggerElement(locatorRef.current);
|
|
530
530
|
var triggerRect = triggerNode.getBoundingClientRect();
|
|
531
531
|
var popperRect = popperRef.current.getBoundingClientRect();
|
|
532
|
-
var left =
|
|
533
|
-
var right =
|
|
534
|
-
var top =
|
|
535
|
-
var bottom =
|
|
532
|
+
var left = triggerRect.left;
|
|
533
|
+
var right = triggerRect.right;
|
|
534
|
+
var top = triggerRect.top;
|
|
535
|
+
var bottom = triggerRect.bottom;
|
|
536
536
|
var X = e.clientX,
|
|
537
537
|
Y = e.clientY;
|
|
538
|
-
var inTriggerRect = X > left
|
|
538
|
+
var inTriggerRect = X > left + 2 && X < right - 2 && Y > top + 2 && Y < bottom - 2;
|
|
539
539
|
var inPopperRect = X > popperRect.left && X < popperRect.right && Y > popperRect.top && Y < popperRect.bottom;
|
|
540
540
|
var ableArea = matchTrigger('contextMenu') ? inPopperRect : inTriggerRect || inPopperRect;
|
|
541
541
|
|
|
@@ -543,7 +543,12 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
543
543
|
mouseleaveTimer && clearTimeout(mouseleaveTimer);
|
|
544
544
|
matchTrigger('focus') && triggerNode.focus();
|
|
545
545
|
} else {
|
|
546
|
-
matchTrigger('hover')
|
|
546
|
+
if (matchTrigger('hover')) {
|
|
547
|
+
mouseleaveTimer && clearTimeout(mouseleaveTimer);
|
|
548
|
+
mouseleaveTimer = window.setTimeout(hidePopper, mouseLeaveDelay * 3000);
|
|
549
|
+
} else {
|
|
550
|
+
hidePopper();
|
|
551
|
+
}
|
|
547
552
|
}
|
|
548
553
|
};
|
|
549
554
|
|
|
@@ -558,6 +563,9 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
558
563
|
};
|
|
559
564
|
|
|
560
565
|
if (matchTrigger('hover')) {
|
|
566
|
+
triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.removeEventListener('mouseleave', debounceHidePopper);
|
|
567
|
+
popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
|
|
568
|
+
triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.addEventListener('mouseleave', debounceHidePopper);
|
|
561
569
|
popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('mouseleave', debounceHidePopper);
|
|
562
570
|
}
|
|
563
571
|
|
|
@@ -565,6 +573,7 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
565
573
|
return document.addEventListener(mapEvent[action], debounceHidePopper);
|
|
566
574
|
}) : document.addEventListener(mapEvent[trigger], debounceHidePopper);
|
|
567
575
|
return function () {
|
|
576
|
+
triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.removeEventListener('mouseleave', debounceHidePopper);
|
|
568
577
|
popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
|
|
569
578
|
Array.isArray(trigger) ? trigger.forEach(function (action) {
|
|
570
579
|
return document.removeEventListener(mapEvent[action], debounceHidePopper);
|
|
@@ -224,7 +224,7 @@
|
|
|
224
224
|
visibility: hidden;
|
|
225
225
|
}
|
|
226
226
|
.kd-cascader-menus .kd-cascader-menu {
|
|
227
|
-
display: inline-
|
|
227
|
+
display: inline-block;
|
|
228
228
|
height: var(--kd-c-cascader-sizing-height, 192px);
|
|
229
229
|
min-width: var(--kd-c-cascader-menu-sizing-min-width, 116px);
|
|
230
230
|
margin: 0;
|
|
@@ -294,7 +294,7 @@ function Panel(props) {
|
|
|
294
294
|
}
|
|
295
295
|
}
|
|
296
296
|
|
|
297
|
-
var showHeader = !(picker === 'date' && showTime || picker === 'time');
|
|
297
|
+
var showHeader = !(picker === 'date' && showTime || picker === 'time') || innerPicker !== undefined;
|
|
298
298
|
var containerCls = classnames("".concat(prefixCls, "-warpper"));
|
|
299
299
|
return /*#__PURE__*/React.createElement("div", {
|
|
300
300
|
className: containerCls
|
|
@@ -249,6 +249,8 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
249
249
|
} else if (valueText !== text) {
|
|
250
250
|
resetText();
|
|
251
251
|
}
|
|
252
|
+
} else {
|
|
253
|
+
setInnerPicker(undefined);
|
|
252
254
|
} // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
253
255
|
|
|
254
256
|
}, [openValue, valueText]);
|
|
@@ -267,9 +269,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
267
269
|
});
|
|
268
270
|
|
|
269
271
|
var triggerChange = function triggerChange(newValue) {
|
|
270
|
-
setSelectedValue(newValue);
|
|
271
|
-
setDateValue(newValue);
|
|
272
|
-
|
|
273
272
|
if (onSelect) {
|
|
274
273
|
onSelect(newValue);
|
|
275
274
|
}
|
|
@@ -277,6 +276,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
277
276
|
if (onChange && !isEqual(dateValue, newValue)) {
|
|
278
277
|
onChange(newValue, newValue ? formatDate(newValue, _format) : '');
|
|
279
278
|
}
|
|
279
|
+
|
|
280
|
+
setSelectedValue(newValue);
|
|
281
|
+
setDateValue(newValue);
|
|
280
282
|
};
|
|
281
283
|
|
|
282
284
|
var triggerOpen = function triggerOpen(newOpen) {
|
|
@@ -290,8 +292,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
290
292
|
var onContextSelect = function onContextSelect(date, type) {
|
|
291
293
|
if (type === 'inner') {
|
|
292
294
|
setViewDate(date);
|
|
293
|
-
setSelectedValue(date);
|
|
294
|
-
setDateValue(date);
|
|
295
295
|
} else {
|
|
296
296
|
if (type === 'submit' || type !== 'key' && !needConfirmButton) {
|
|
297
297
|
setViewDate(date);
|
|
@@ -557,6 +557,8 @@
|
|
|
557
557
|
padding: 3px 0;
|
|
558
558
|
cursor: pointer;
|
|
559
559
|
overflow: hidden;
|
|
560
|
+
-webkit-box-sizing: border-box;
|
|
561
|
+
box-sizing: border-box;
|
|
560
562
|
}
|
|
561
563
|
.kd-date-picker-panel .kd-date-picker-warpper .kd-date-picker-calendar .kd-date-picker-calendar-line .kd-date-picker-calendar-item:not(.kd-date-picker-calendar-item-disabled):hover .kd-date-picker-calendar-text {
|
|
562
564
|
background: #f5f5f5;
|
|
@@ -794,8 +796,7 @@
|
|
|
794
796
|
flex: 1 0 auto;
|
|
795
797
|
width: 56px;
|
|
796
798
|
margin: 0;
|
|
797
|
-
padding:
|
|
798
|
-
padding-top: 10px;
|
|
799
|
+
padding: 10px 0 214px 0;
|
|
799
800
|
text-align: left;
|
|
800
801
|
-webkit-transition: background 0.3s;
|
|
801
802
|
transition: background 0.3s;
|
|
@@ -408,6 +408,7 @@
|
|
|
408
408
|
padding: 3px 0;
|
|
409
409
|
cursor: pointer;
|
|
410
410
|
overflow: hidden;
|
|
411
|
+
box-sizing: border-box;
|
|
411
412
|
}
|
|
412
413
|
|
|
413
414
|
& .@{datePicker-prefix-cls}-calendar-item:not(.@{datePicker-prefix-cls}-calendar-item-disabled):hover {
|
|
@@ -676,8 +677,7 @@
|
|
|
676
677
|
flex: 1 0 auto;
|
|
677
678
|
width: 56px;
|
|
678
679
|
margin: 0;
|
|
679
|
-
padding:
|
|
680
|
-
padding-top: 10px;
|
|
680
|
+
padding: 10px 0 214px 0;
|
|
681
681
|
text-align: left;
|
|
682
682
|
transition: background 0.3s;
|
|
683
683
|
overflow: hidden;
|
package/es/form/Field.js
CHANGED
|
@@ -275,16 +275,18 @@ var Field = function Field(props) {
|
|
|
275
275
|
evt[_key] = arguments[_key];
|
|
276
276
|
}
|
|
277
277
|
|
|
278
|
+
var iv = getInputValueFormProp(evt[0], evt);
|
|
279
|
+
|
|
278
280
|
if (chValue === undefined) {
|
|
279
|
-
var iv = getInputValueFormProp(evt[0], evt);
|
|
280
281
|
setFieldValue(iv);
|
|
281
|
-
dispatch({
|
|
282
|
-
type: 'updateValue',
|
|
283
|
-
namePath: name,
|
|
284
|
-
value: iv
|
|
285
|
-
});
|
|
286
282
|
}
|
|
287
283
|
|
|
284
|
+
dispatch({
|
|
285
|
+
type: 'updateValue',
|
|
286
|
+
namePath: name,
|
|
287
|
+
value: iv
|
|
288
|
+
});
|
|
289
|
+
|
|
288
290
|
if (typeof chChange === 'function') {
|
|
289
291
|
chChange.apply(void 0, evt);
|
|
290
292
|
}
|
|
@@ -28,7 +28,8 @@ var ClearableInput = function ClearableInput(props) {
|
|
|
28
28
|
addonAfter = props.addonAfter,
|
|
29
29
|
focused = props.focused,
|
|
30
30
|
numberMark = props.numberMark,
|
|
31
|
-
inputCount = props.inputCount
|
|
31
|
+
inputCount = props.inputCount,
|
|
32
|
+
count = props.count;
|
|
32
33
|
|
|
33
34
|
var _useState = useState(false),
|
|
34
35
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -77,7 +78,7 @@ var ClearableInput = function ClearableInput(props) {
|
|
|
77
78
|
var renderInputWithFixNode = function renderInputWithFixNode(originElement) {
|
|
78
79
|
var _context, _classNames2;
|
|
79
80
|
|
|
80
|
-
if (!hasPrefixSuffix(props)) {
|
|
81
|
+
if (!hasPrefixSuffix(props) && !count) {
|
|
81
82
|
return originElement;
|
|
82
83
|
}
|
|
83
84
|
|
|
@@ -99,7 +100,7 @@ var ClearableInput = function ClearableInput(props) {
|
|
|
99
100
|
var renderInputWithLabel = function renderInputWithLabel(originElement) {
|
|
100
101
|
var _classNames4, _context2, _classNames5;
|
|
101
102
|
|
|
102
|
-
if (!addonBefore && !addonAfter) {
|
|
103
|
+
if (!addonBefore && !addonAfter && !count) {
|
|
103
104
|
return originElement;
|
|
104
105
|
}
|
|
105
106
|
|
package/es/input/input.js
CHANGED
|
@@ -149,7 +149,11 @@ var InternalInput = function InternalInput(props, ref) {
|
|
|
149
149
|
|
|
150
150
|
if (count && showNumberMark && !disabled) {
|
|
151
151
|
return /*#__PURE__*/React.createElement("div", {
|
|
152
|
-
className: classNames("".concat(inputPrefixCls, "-input-mark-inner"))
|
|
152
|
+
className: classNames("".concat(inputPrefixCls, "-input-mark-inner")),
|
|
153
|
+
onMouseDown: function onMouseDown(e) {
|
|
154
|
+
e.stopPropagation();
|
|
155
|
+
e.preventDefault();
|
|
156
|
+
}
|
|
153
157
|
}, enteredLength, maxLength !== undefined ? "/".concat(maxLength) : null);
|
|
154
158
|
}
|
|
155
159
|
|
|
@@ -188,6 +192,7 @@ var InternalInput = function InternalInput(props, ref) {
|
|
|
188
192
|
prefixCls: inputPrefixCls,
|
|
189
193
|
element: renderInput(),
|
|
190
194
|
focused: focused,
|
|
195
|
+
count: count,
|
|
191
196
|
inputCount: renderCount()
|
|
192
197
|
}));
|
|
193
198
|
};
|
|
@@ -161,29 +161,42 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
|
|
|
161
161
|
_numerical$split2$ = _numerical$split2[1],
|
|
162
162
|
decimalValue = _numerical$split2$ === void 0 ? '' : _numerical$split2$;
|
|
163
163
|
|
|
164
|
+
var sign = '';
|
|
165
|
+
|
|
166
|
+
if (_includesInstanceProperty(integerValue).call(integerValue, '-')) {
|
|
167
|
+
integerValue = integerValue.replace('-', '');
|
|
168
|
+
sign = '-';
|
|
169
|
+
}
|
|
170
|
+
|
|
164
171
|
var integerValueLength = integerValue.length;
|
|
165
172
|
var decimalValueLength = decimalValue.length;
|
|
166
173
|
|
|
167
174
|
if (typeof decimalLength === 'number' && typeof digitLength === 'number') {
|
|
168
|
-
if (integerValueLength
|
|
169
|
-
resultNumerical =
|
|
170
|
-
} else if (
|
|
175
|
+
if (decimalValueLength <= decimalLength && integerValueLength <= digitLength - decimalLength) {
|
|
176
|
+
resultNumerical = numerical;
|
|
177
|
+
} else if (integerValueLength > digitLength - decimalLength) {
|
|
171
178
|
var _context;
|
|
172
179
|
|
|
173
|
-
resultNumerical = _concatInstanceProperty(_context = "".concat(
|
|
180
|
+
resultNumerical = _concatInstanceProperty(_context = "".concat(sign)).call(_context, integerValue.substr(0, digitLength - decimalLength));
|
|
181
|
+
} else if (decimalValueLength > decimalLength) {
|
|
182
|
+
var _context2, _context3;
|
|
183
|
+
|
|
184
|
+
resultNumerical = _concatInstanceProperty(_context2 = _concatInstanceProperty(_context3 = "".concat(sign)).call(_context3, integerValue, ".")).call(_context2, decimalValue.substr(0, decimalLength));
|
|
174
185
|
}
|
|
175
186
|
} else if (typeof decimalLength !== 'number' && typeof digitLength === 'number') {
|
|
176
187
|
if (integerValueLength >= digitLength) {
|
|
177
|
-
|
|
188
|
+
var _context4;
|
|
189
|
+
|
|
190
|
+
resultNumerical = _concatInstanceProperty(_context4 = "".concat(sign)).call(_context4, integerValue.substr(0, digitLength));
|
|
178
191
|
} else {
|
|
179
|
-
var
|
|
192
|
+
var _context5, _context6, _context7;
|
|
180
193
|
|
|
181
|
-
resultNumerical = decimalValueLength ? _concatInstanceProperty(
|
|
194
|
+
resultNumerical = decimalValueLength ? _concatInstanceProperty(_context5 = _concatInstanceProperty(_context6 = "".concat(sign)).call(_context6, integerValue, ".")).call(_context5, decimalValue.substr(0, digitLength - integerValueLength)) : _concatInstanceProperty(_context7 = "".concat(sign)).call(_context7, integerValue);
|
|
182
195
|
}
|
|
183
196
|
} else if (typeof decimalLength === 'number' && typeof digitLength !== 'number') {
|
|
184
|
-
var
|
|
197
|
+
var _context8, _context9, _context10;
|
|
185
198
|
|
|
186
|
-
resultNumerical = decimalValueLength ? _concatInstanceProperty(
|
|
199
|
+
resultNumerical = decimalValueLength ? _concatInstanceProperty(_context8 = _concatInstanceProperty(_context9 = "".concat(sign)).call(_context9, integerValue, ".")).call(_context8, decimalValue.substr(0, decimalLength)) : _concatInstanceProperty(_context10 = "".concat(sign)).call(_context10, integerValue);
|
|
187
200
|
} else {
|
|
188
201
|
resultNumerical = numerical;
|
|
189
202
|
}
|
|
@@ -220,7 +233,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
|
|
|
220
233
|
};
|
|
221
234
|
|
|
222
235
|
var handleKeyDown = function handleKeyDown(event) {
|
|
223
|
-
var
|
|
236
|
+
var _context11;
|
|
224
237
|
|
|
225
238
|
if (!stepOption || props.disabled || props.readOnly) {
|
|
226
239
|
return;
|
|
@@ -228,7 +241,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
|
|
|
228
241
|
|
|
229
242
|
var keyCode = event.keyCode;
|
|
230
243
|
|
|
231
|
-
if (_includesInstanceProperty(
|
|
244
|
+
if (_includesInstanceProperty(_context11 = [38, 40]).call(_context11, keyCode)) {
|
|
232
245
|
event.preventDefault();
|
|
233
246
|
handleStepChang(keyCode === 38 ? 'plus' : 'minus');
|
|
234
247
|
}
|
package/es/tree/tree.js
CHANGED
|
@@ -233,6 +233,11 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
233
233
|
}, [loadData, setExpandedKeys]);
|
|
234
234
|
var handleExpand = React.useCallback(function (key, expanded, node) {
|
|
235
235
|
var newExpandedKeys = expanded ? addKeys(expandedKeys, [key]) : delKey(expandedKeys, [key]);
|
|
236
|
+
|
|
237
|
+
if (expandedKeysProps === undefined) {
|
|
238
|
+
setExpandedKeys(newExpandedKeys);
|
|
239
|
+
}
|
|
240
|
+
|
|
236
241
|
onExpand && onExpand(newExpandedKeys, {
|
|
237
242
|
node: node,
|
|
238
243
|
expanded: expanded
|
|
@@ -407,8 +412,6 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
407
412
|
if (scrollToKey) {
|
|
408
413
|
setSelectedKeys([scrollToKey]);
|
|
409
414
|
setScrollKey(scrollToKey);
|
|
410
|
-
} else {
|
|
411
|
-
setSelectedKeys([]);
|
|
412
415
|
}
|
|
413
416
|
}, [scrollToKey]);
|
|
414
417
|
useEffect(function () {
|
|
@@ -442,7 +445,7 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
442
445
|
item.onDrop = handleDrop;
|
|
443
446
|
item.onSelect = handleSelect;
|
|
444
447
|
item.checked = checked;
|
|
445
|
-
item.selected = getSelected(selectedKeys, item.key);
|
|
448
|
+
item.selected = getSelected(Array.isArray(selectedKeys) && selectedKeys[0] ? [selectedKeys[0]] : selectedKeys, item.key);
|
|
446
449
|
item.indeterminate = indeterminate;
|
|
447
450
|
item.disabled = getDisabled(disabled, item.disabled);
|
|
448
451
|
item.showIcon = showIcon || false;
|
package/es/tree/treeHooks.js
CHANGED
|
@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
|
|
|
2
2
|
import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
|
|
3
3
|
import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
|
|
4
4
|
import React, { useEffect, useState } from 'react';
|
|
5
|
-
import { getInitCheckededKeys, getDataCheckededStateStrictly, getInitExpandedKeys, getPos, getAllParentKeys
|
|
5
|
+
import { getInitCheckededKeys, getDataCheckededStateStrictly, getInitExpandedKeys, getPos, getAllParentKeys } from './utils/treeUtils';
|
|
6
6
|
export var useViewportHeight = function useViewportHeight(height, listRef) {
|
|
7
7
|
var _React$useState = React.useState(0),
|
|
8
8
|
_React$useState2 = _slicedToArray(_React$useState, 2),
|
|
@@ -73,11 +73,8 @@ export var useExpand = function useExpand(flattenAllData, expandedKeysProps, def
|
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
var initialExpandedKeys = React.useMemo(function () {
|
|
76
|
-
return getInitExpandedKeys(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys);
|
|
77
|
-
}, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys]);
|
|
78
|
-
var newExpandedKeys = React.useMemo(function () {
|
|
79
|
-
return getExpandedKeys(expandedKeysProps, expandScrollkeys);
|
|
80
|
-
}, [expandedKeysProps]);
|
|
76
|
+
return getInitExpandedKeys(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit);
|
|
77
|
+
}, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit]);
|
|
81
78
|
|
|
82
79
|
var _React$useState7 = React.useState(initialExpandedKeys),
|
|
83
80
|
_React$useState8 = _slicedToArray(_React$useState7, 2),
|
|
@@ -85,9 +82,8 @@ export var useExpand = function useExpand(flattenAllData, expandedKeysProps, def
|
|
|
85
82
|
setExpandedKeys = _React$useState8[1];
|
|
86
83
|
|
|
87
84
|
React.useEffect(function () {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}, [newExpandedKeys, initialExpandedKeys, isSearching, isInit]);
|
|
85
|
+
setExpandedKeys(initialExpandedKeys);
|
|
86
|
+
}, [expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent]);
|
|
91
87
|
return [expandedKeys, setExpandedKeys];
|
|
92
88
|
};
|
|
93
89
|
export var useScrollToKey = function useScrollToKey(scrollKey, index, estimatedItemSize, scrollRef, viewportHeight, treeNodePrefixCls) {
|
|
@@ -60,6 +60,6 @@ export declare const getDataCheckededStateStrictly: (checkedKeys: string[]) => {
|
|
|
60
60
|
};
|
|
61
61
|
export declare const delKey: (prevKeys: string[], delKeys: string[]) => never[] & string[];
|
|
62
62
|
export declare const getAllNodeKeys: (data: any[]) => string[];
|
|
63
|
-
export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType, searchExpandedKeys: string[]) => string[];
|
|
63
|
+
export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType, searchExpandedKeys: string[], isInit: boolean) => string[];
|
|
64
64
|
export declare const getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
|
|
65
65
|
export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;
|
|
@@ -704,25 +704,28 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
|
|
|
704
704
|
var isSearching = arguments.length > 8 ? arguments[8] : undefined;
|
|
705
705
|
var keysData = arguments.length > 9 ? arguments[9] : undefined;
|
|
706
706
|
var searchExpandedKeys = arguments.length > 10 ? arguments[10] : undefined;
|
|
707
|
+
var isInit = arguments.length > 11 ? arguments[11] : undefined;
|
|
707
708
|
var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : _concatInstanceProperty(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : _concatInstanceProperty(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
|
|
708
709
|
|
|
709
|
-
if (
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
710
|
+
if (isInit) {
|
|
711
|
+
if (defaultExpandAll) {
|
|
712
|
+
keys = getAllNodeKeys(data);
|
|
713
|
+
} else {
|
|
714
|
+
if (defaultExpandRoot) {
|
|
715
|
+
var rootKey = getRootKeys(data);
|
|
714
716
|
|
|
715
|
-
|
|
716
|
-
|
|
717
|
+
if (rootKey) {
|
|
718
|
+
keys = _concatInstanceProperty(keys).call(keys, rootKey);
|
|
719
|
+
}
|
|
717
720
|
}
|
|
718
|
-
}
|
|
719
721
|
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
722
|
+
if (defaultExpandParent) {
|
|
723
|
+
var parentKeys = [];
|
|
724
|
+
keys.forEach(function (key) {
|
|
725
|
+
parentKeys.push.apply(parentKeys, _toConsumableArray(getAllParentKeys(data, key)));
|
|
726
|
+
});
|
|
727
|
+
keys = _concatInstanceProperty(keys).call(keys, parentKeys);
|
|
728
|
+
}
|
|
726
729
|
}
|
|
727
730
|
}
|
|
728
731
|
|
package/es/upload/upload.js
CHANGED
|
@@ -551,7 +551,7 @@ var Item = function Item(_ref3) {
|
|
|
551
551
|
width: '100%',
|
|
552
552
|
height: '100%'
|
|
553
553
|
},
|
|
554
|
-
operations: [/*#__PURE__*/React.createElement(Icon, {
|
|
554
|
+
operations: disabled ? [] : [/*#__PURE__*/React.createElement(Icon, {
|
|
555
555
|
key: "1",
|
|
556
556
|
type: "delete",
|
|
557
557
|
onClick: handleRemove.bind(_this, file)
|
package/lib/_utils/usePopper.js
CHANGED
|
@@ -558,18 +558,18 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
558
558
|
(0, _react.useEffect)(function () {
|
|
559
559
|
if (exist && visible) {
|
|
560
560
|
var mouseleaveTimer;
|
|
561
|
+
var triggerNode = getTriggerElement(locatorRef.current);
|
|
561
562
|
|
|
562
563
|
var handleHidePopper = function handleHidePopper(e) {
|
|
563
|
-
var triggerNode = getTriggerElement(locatorRef.current);
|
|
564
564
|
var triggerRect = triggerNode.getBoundingClientRect();
|
|
565
565
|
var popperRect = popperRef.current.getBoundingClientRect();
|
|
566
|
-
var left =
|
|
567
|
-
var right =
|
|
568
|
-
var top =
|
|
569
|
-
var bottom =
|
|
566
|
+
var left = triggerRect.left;
|
|
567
|
+
var right = triggerRect.right;
|
|
568
|
+
var top = triggerRect.top;
|
|
569
|
+
var bottom = triggerRect.bottom;
|
|
570
570
|
var X = e.clientX,
|
|
571
571
|
Y = e.clientY;
|
|
572
|
-
var inTriggerRect = X > left
|
|
572
|
+
var inTriggerRect = X > left + 2 && X < right - 2 && Y > top + 2 && Y < bottom - 2;
|
|
573
573
|
var inPopperRect = X > popperRect.left && X < popperRect.right && Y > popperRect.top && Y < popperRect.bottom;
|
|
574
574
|
var ableArea = matchTrigger('contextMenu') ? inPopperRect : inTriggerRect || inPopperRect;
|
|
575
575
|
|
|
@@ -577,7 +577,12 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
577
577
|
mouseleaveTimer && clearTimeout(mouseleaveTimer);
|
|
578
578
|
matchTrigger('focus') && triggerNode.focus();
|
|
579
579
|
} else {
|
|
580
|
-
matchTrigger('hover')
|
|
580
|
+
if (matchTrigger('hover')) {
|
|
581
|
+
mouseleaveTimer && clearTimeout(mouseleaveTimer);
|
|
582
|
+
mouseleaveTimer = window.setTimeout(hidePopper, mouseLeaveDelay * 3000);
|
|
583
|
+
} else {
|
|
584
|
+
hidePopper();
|
|
585
|
+
}
|
|
581
586
|
}
|
|
582
587
|
};
|
|
583
588
|
|
|
@@ -592,6 +597,9 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
592
597
|
};
|
|
593
598
|
|
|
594
599
|
if (matchTrigger('hover')) {
|
|
600
|
+
triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.removeEventListener('mouseleave', debounceHidePopper);
|
|
601
|
+
popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
|
|
602
|
+
triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.addEventListener('mouseleave', debounceHidePopper);
|
|
595
603
|
popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('mouseleave', debounceHidePopper);
|
|
596
604
|
}
|
|
597
605
|
|
|
@@ -599,6 +607,7 @@ function usePopper(locatorElement, popperElement, props) {
|
|
|
599
607
|
return document.addEventListener(mapEvent[action], debounceHidePopper);
|
|
600
608
|
}) : document.addEventListener(mapEvent[trigger], debounceHidePopper);
|
|
601
609
|
return function () {
|
|
610
|
+
triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.removeEventListener('mouseleave', debounceHidePopper);
|
|
602
611
|
popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
|
|
603
612
|
Array.isArray(trigger) ? trigger.forEach(function (action) {
|
|
604
613
|
return document.removeEventListener(mapEvent[action], debounceHidePopper);
|
|
@@ -224,7 +224,7 @@
|
|
|
224
224
|
visibility: hidden;
|
|
225
225
|
}
|
|
226
226
|
.kd-cascader-menus .kd-cascader-menu {
|
|
227
|
-
display: inline-
|
|
227
|
+
display: inline-block;
|
|
228
228
|
height: var(--kd-c-cascader-sizing-height, 192px);
|
|
229
229
|
min-width: var(--kd-c-cascader-menu-sizing-min-width, 116px);
|
|
230
230
|
margin: 0;
|
|
@@ -327,7 +327,7 @@ function Panel(props) {
|
|
|
327
327
|
}
|
|
328
328
|
}
|
|
329
329
|
|
|
330
|
-
var showHeader = !(picker === 'date' && showTime || picker === 'time');
|
|
330
|
+
var showHeader = !(picker === 'date' && showTime || picker === 'time') || innerPicker !== undefined;
|
|
331
331
|
var containerCls = (0, _classnames3.default)("".concat(prefixCls, "-warpper"));
|
|
332
332
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
333
333
|
className: containerCls
|
|
@@ -290,6 +290,8 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
290
290
|
} else if (valueText !== text) {
|
|
291
291
|
resetText();
|
|
292
292
|
}
|
|
293
|
+
} else {
|
|
294
|
+
setInnerPicker(undefined);
|
|
293
295
|
} // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
294
296
|
|
|
295
297
|
}, [openValue, valueText]);
|
|
@@ -308,9 +310,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
308
310
|
});
|
|
309
311
|
|
|
310
312
|
var triggerChange = function triggerChange(newValue) {
|
|
311
|
-
setSelectedValue(newValue);
|
|
312
|
-
setDateValue(newValue);
|
|
313
|
-
|
|
314
313
|
if (onSelect) {
|
|
315
314
|
onSelect(newValue);
|
|
316
315
|
}
|
|
@@ -318,6 +317,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
318
317
|
if (onChange && !(0, _dateFns.isEqual)(dateValue, newValue)) {
|
|
319
318
|
onChange(newValue, newValue ? (0, _dateFns.formatDate)(newValue, _format) : '');
|
|
320
319
|
}
|
|
320
|
+
|
|
321
|
+
setSelectedValue(newValue);
|
|
322
|
+
setDateValue(newValue);
|
|
321
323
|
};
|
|
322
324
|
|
|
323
325
|
var triggerOpen = function triggerOpen(newOpen) {
|
|
@@ -331,8 +333,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
331
333
|
var onContextSelect = function onContextSelect(date, type) {
|
|
332
334
|
if (type === 'inner') {
|
|
333
335
|
setViewDate(date);
|
|
334
|
-
setSelectedValue(date);
|
|
335
|
-
setDateValue(date);
|
|
336
336
|
} else {
|
|
337
337
|
if (type === 'submit' || type !== 'key' && !needConfirmButton) {
|
|
338
338
|
setViewDate(date);
|
|
@@ -557,6 +557,8 @@
|
|
|
557
557
|
padding: 3px 0;
|
|
558
558
|
cursor: pointer;
|
|
559
559
|
overflow: hidden;
|
|
560
|
+
-webkit-box-sizing: border-box;
|
|
561
|
+
box-sizing: border-box;
|
|
560
562
|
}
|
|
561
563
|
.kd-date-picker-panel .kd-date-picker-warpper .kd-date-picker-calendar .kd-date-picker-calendar-line .kd-date-picker-calendar-item:not(.kd-date-picker-calendar-item-disabled):hover .kd-date-picker-calendar-text {
|
|
562
564
|
background: #f5f5f5;
|
|
@@ -794,8 +796,7 @@
|
|
|
794
796
|
flex: 1 0 auto;
|
|
795
797
|
width: 56px;
|
|
796
798
|
margin: 0;
|
|
797
|
-
padding:
|
|
798
|
-
padding-top: 10px;
|
|
799
|
+
padding: 10px 0 214px 0;
|
|
799
800
|
text-align: left;
|
|
800
801
|
-webkit-transition: background 0.3s;
|
|
801
802
|
transition: background 0.3s;
|
|
@@ -408,6 +408,7 @@
|
|
|
408
408
|
padding: 3px 0;
|
|
409
409
|
cursor: pointer;
|
|
410
410
|
overflow: hidden;
|
|
411
|
+
box-sizing: border-box;
|
|
411
412
|
}
|
|
412
413
|
|
|
413
414
|
& .@{datePicker-prefix-cls}-calendar-item:not(.@{datePicker-prefix-cls}-calendar-item-disabled):hover {
|
|
@@ -676,8 +677,7 @@
|
|
|
676
677
|
flex: 1 0 auto;
|
|
677
678
|
width: 56px;
|
|
678
679
|
margin: 0;
|
|
679
|
-
padding:
|
|
680
|
-
padding-top: 10px;
|
|
680
|
+
padding: 10px 0 214px 0;
|
|
681
681
|
text-align: left;
|
|
682
682
|
transition: background 0.3s;
|
|
683
683
|
overflow: hidden;
|