@kdcloudjs/kdesign 1.6.38 → 1.6.40
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 +31 -0
- package/dist/kdesign.css +1 -1
- package/dist/kdesign.css.map +1 -1
- package/dist/kdesign.js +143 -127
- package/dist/kdesign.js.map +1 -1
- package/dist/kdesign.min.css +1 -1
- package/dist/kdesign.min.js +6 -6
- package/dist/kdesign.min.js.map +1 -1
- package/es/button/button.js +2 -2
- package/es/date-picker/date-panel.js +20 -16
- package/es/date-picker/range-picker.d.ts +10 -10
- package/es/date-picker/range-picker.js +48 -46
- package/es/input/ClearableLabeledInput.js +1 -1
- package/es/select/interface.d.ts +1 -1
- package/es/select/select.js +18 -5
- package/es/tree/utils/treeUtils.js +11 -13
- package/es/upload/upload.d.ts +1 -1
- package/es/upload/upload.js +4 -3
- package/lib/button/button.js +2 -2
- package/lib/date-picker/date-panel.js +20 -16
- package/lib/date-picker/range-picker.d.ts +10 -10
- package/lib/date-picker/range-picker.js +46 -44
- package/lib/input/ClearableLabeledInput.js +1 -1
- package/lib/select/interface.d.ts +1 -1
- package/lib/select/select.js +18 -5
- package/lib/tree/utils/treeUtils.js +11 -13
- package/lib/upload/upload.d.ts +1 -1
- package/lib/upload/upload.js +41 -40
- package/package.json +4 -5
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import React from 'react';
|
|
1
|
+
import React, { ReactNode, Ref, FocusEventHandler, CSSProperties } from 'react';
|
|
2
2
|
import { DateType, RangeValue, EventValue, DisabledTimes, PanelMode, SharedTimeProps } from './interface';
|
|
3
3
|
import { PickerBaseProps, PickerDateProps, PickerTimeProps } from './date-picker';
|
|
4
4
|
export declare type RangeType = 'start' | 'end';
|
|
5
5
|
export interface RangeInfo {
|
|
6
6
|
range: RangeType;
|
|
7
7
|
}
|
|
8
|
-
export declare type RangeDateRender = (currentDate: DateType, today: DateType, info: RangeInfo) =>
|
|
8
|
+
export declare type RangeDateRender = (currentDate: DateType, today: DateType, info: RangeInfo) => ReactNode;
|
|
9
9
|
export interface RangePickerSharedProps {
|
|
10
10
|
id?: string;
|
|
11
11
|
value?: RangeValue;
|
|
@@ -15,23 +15,23 @@ export interface RangePickerSharedProps {
|
|
|
15
15
|
disabled?: boolean | [boolean, boolean];
|
|
16
16
|
disabledTimePanel?: (date: EventValue, type: RangeType) => DisabledTimes;
|
|
17
17
|
ranges?: Record<string, DateType[] | (() => DateType[])>;
|
|
18
|
-
separator?:
|
|
18
|
+
separator?: ReactNode;
|
|
19
19
|
allowEmpty?: [boolean, boolean];
|
|
20
|
-
suffixIcon?:
|
|
21
|
-
clearIcon?:
|
|
20
|
+
suffixIcon?: ReactNode;
|
|
21
|
+
clearIcon?: ReactNode;
|
|
22
22
|
mode?: [PanelMode, PanelMode];
|
|
23
23
|
onChange?: (values: RangeValue, formatString: [string | null, string | null]) => void;
|
|
24
24
|
onCalendarChange?: (values: RangeValue, formatString: [string | null, string | null], info: RangeInfo) => void;
|
|
25
25
|
onPanelChange?: (values: RangeValue, modes: [PanelMode, PanelMode]) => void;
|
|
26
|
-
onFocus?:
|
|
27
|
-
onBlur?:
|
|
26
|
+
onFocus?: FocusEventHandler<HTMLInputElement>;
|
|
27
|
+
onBlur?: FocusEventHandler<HTMLInputElement>;
|
|
28
28
|
onOk?: (dates: RangeValue) => void;
|
|
29
29
|
activePickerIndex?: 0 | 1;
|
|
30
30
|
dateRender?: RangeDateRender;
|
|
31
|
-
panelRender?: (originPanel:
|
|
31
|
+
panelRender?: (originPanel: ReactNode) => ReactNode;
|
|
32
32
|
getPopupContainer?: (node: HTMLElement) => HTMLElement;
|
|
33
|
-
popupRef?:
|
|
34
|
-
popupStyle?:
|
|
33
|
+
popupRef?: Ref<any>;
|
|
34
|
+
popupStyle?: CSSProperties;
|
|
35
35
|
dropdownClassName?: string;
|
|
36
36
|
}
|
|
37
37
|
declare type OmitPickerProps<Props> = Omit<Props, 'value' | 'defaultValue' | 'defaultPickerValue' | 'placeholder' | 'disabled' | 'disabledTimePanel' | 'showToday' | 'showTime' | 'mode' | 'onChange' | 'onSelect' | 'onPanelChange' | 'pickerValue' | 'onPickerValueChange' | 'onOk' | 'dateRender'>;
|
|
@@ -127,16 +127,18 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
127
127
|
componentName: 'DatePicker'
|
|
128
128
|
}), locale || {});
|
|
129
129
|
// ref
|
|
130
|
-
var panelDivRef = _react.
|
|
131
|
-
var
|
|
132
|
-
var
|
|
133
|
-
var
|
|
134
|
-
var
|
|
135
|
-
var
|
|
136
|
-
var
|
|
137
|
-
var
|
|
138
|
-
var
|
|
139
|
-
var
|
|
130
|
+
var panelDivRef = (0, _react.useRef)(null);
|
|
131
|
+
var defaultRef = (0, _react.useRef)(null);
|
|
132
|
+
var inputDivRef = ref || defaultRef;
|
|
133
|
+
var startInputDivRef = (0, _react.useRef)(null);
|
|
134
|
+
var endInputDivRef = (0, _react.useRef)(null);
|
|
135
|
+
var separatorRef = (0, _react.useRef)(null);
|
|
136
|
+
var startInputRef = (0, _react.useRef)(null);
|
|
137
|
+
var endInputRef = (0, _react.useRef)(null);
|
|
138
|
+
var defaultPopupRef = (0, _react.useRef)(null);
|
|
139
|
+
var popperRef = popupRef || defaultPopupRef;
|
|
140
|
+
var openRecordsRef = (0, _react.useRef)({});
|
|
141
|
+
var mergedDisabled = (0, _react.useMemo)(function () {
|
|
140
142
|
if (Array.isArray(disabled)) {
|
|
141
143
|
return disabled;
|
|
142
144
|
}
|
|
@@ -280,10 +282,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
280
282
|
endText = _useTextValueMapping4[0],
|
|
281
283
|
triggerEndTextChange = _useTextValueMapping4[1],
|
|
282
284
|
resetEndText = _useTextValueMapping4[2];
|
|
283
|
-
var
|
|
284
|
-
|
|
285
|
-
hoverRangedValue =
|
|
286
|
-
setHoverRangedValue =
|
|
285
|
+
var _useState = (0, _react.useState)([null, null]),
|
|
286
|
+
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
287
|
+
hoverRangedValue = _useState2[0],
|
|
288
|
+
setHoverRangedValue = _useState2[1];
|
|
287
289
|
var _useHoverValue = (0, _useHoverValue5.default)(startText, {
|
|
288
290
|
format: _format
|
|
289
291
|
}),
|
|
@@ -321,20 +323,13 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
321
323
|
_useMergedState10 = (0, _slicedToArray2.default)(_useMergedState9, 2),
|
|
322
324
|
mergedModes = _useMergedState10[0],
|
|
323
325
|
setInnerModes = _useMergedState10[1];
|
|
324
|
-
var
|
|
325
|
-
|
|
326
|
-
innerPicker =
|
|
327
|
-
setInnerPicker =
|
|
326
|
+
var _useState3 = (0, _react.useState)(undefined),
|
|
327
|
+
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
328
|
+
innerPicker = _useState4[0],
|
|
329
|
+
setInnerPicker = _useState4[1];
|
|
328
330
|
(0, _react.useEffect)(function () {
|
|
329
331
|
setInnerModes([picker, picker]);
|
|
330
332
|
}, [picker]);
|
|
331
|
-
// const triggerModesChange = (modes: [PanelMode, PanelMode], values: RangeValue) => {
|
|
332
|
-
// setInnerModes(modes)
|
|
333
|
-
// if (onPanelChange) {
|
|
334
|
-
// onPanelChange(values, modes)
|
|
335
|
-
// }
|
|
336
|
-
// }
|
|
337
|
-
// ========================= Disable Date ==========================
|
|
338
333
|
var _useRangeDisabled = (0, _useRangeDisabled3.default)({
|
|
339
334
|
picker: picker,
|
|
340
335
|
selectedValue: selectedValue,
|
|
@@ -344,11 +339,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
344
339
|
_useRangeDisabled2 = (0, _slicedToArray2.default)(_useRangeDisabled, 2),
|
|
345
340
|
disabledStartDate = _useRangeDisabled2[0],
|
|
346
341
|
disabledEndDate = _useRangeDisabled2[1];
|
|
347
|
-
|
|
348
|
-
// resetEndText()
|
|
349
|
-
// resetStartText()
|
|
350
|
-
// }
|
|
351
|
-
var triggerRef = _react.default.useRef();
|
|
342
|
+
var triggerRef = (0, _react.useRef)();
|
|
352
343
|
var triggerOpen = function triggerOpen(newOpen, index) {
|
|
353
344
|
if (newOpen) {
|
|
354
345
|
clearTimeout(triggerRef.current);
|
|
@@ -427,22 +418,28 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
427
418
|
triggerOpen(false, sourceIndex);
|
|
428
419
|
}
|
|
429
420
|
};
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
})
|
|
421
|
+
// useOnClickOutside([popperRef, inputDivRef], () => {
|
|
422
|
+
// setViewDate(null, 0)
|
|
423
|
+
// setViewDate(null, 1)
|
|
424
|
+
// setHoverRangedValue([null, null])
|
|
425
|
+
// })
|
|
435
426
|
var onSelect = function onSelect(date, type) {
|
|
436
427
|
var values = (0, _utils2.updateValues)(selectedValue, date, mergedActivePickerIndex);
|
|
437
|
-
if (type === '
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
onStartLeave();
|
|
441
|
-
} else {
|
|
442
|
-
onEndLeave();
|
|
428
|
+
if (type === 'inner') {
|
|
429
|
+
if (values && values[mergedActivePickerIndex]) {
|
|
430
|
+
setViewDate(values[mergedActivePickerIndex], mergedActivePickerIndex);
|
|
443
431
|
}
|
|
444
432
|
} else {
|
|
445
|
-
|
|
433
|
+
if (type === 'submit' || type !== 'key' && !needConfirmButton) {
|
|
434
|
+
triggerChange(values, mergedActivePickerIndex);
|
|
435
|
+
if (mergedActivePickerIndex === 0) {
|
|
436
|
+
onStartLeave();
|
|
437
|
+
} else {
|
|
438
|
+
onEndLeave();
|
|
439
|
+
}
|
|
440
|
+
} else {
|
|
441
|
+
setSelectedValue(values);
|
|
442
|
+
}
|
|
446
443
|
}
|
|
447
444
|
};
|
|
448
445
|
var onDateMouseEnter = function onDateMouseEnter(date) {
|
|
@@ -472,6 +469,11 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
472
469
|
if (!endValueTexts.length || endValueTexts[0] === '') {
|
|
473
470
|
triggerEndTextChange('');
|
|
474
471
|
}
|
|
472
|
+
setViewDate(null, 0);
|
|
473
|
+
setViewDate(null, 1);
|
|
474
|
+
setHoverRangedValue([null, null]);
|
|
475
|
+
} else {
|
|
476
|
+
setInnerPicker(undefined);
|
|
475
477
|
}
|
|
476
478
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
477
479
|
}, [mergedOpen, startValueTexts, endValueTexts]);
|
|
@@ -551,7 +553,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
551
553
|
}, renderPanel());
|
|
552
554
|
panels = /*#__PURE__*/_react.default.createElement("div", {
|
|
553
555
|
className: (0, _classnames.default)("".concat(datePickerPrefixCls, "-container-date"))
|
|
554
|
-
}, leftPanel, rightPanel);
|
|
556
|
+
}, leftPanel, innerPicker === undefined ? rightPanel : null);
|
|
555
557
|
} else {
|
|
556
558
|
panels = /*#__PURE__*/_react.default.createElement(_context.default.Provider, {
|
|
557
559
|
value: {
|
|
@@ -706,7 +708,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
706
708
|
getPopupContainer: getPopupContainer
|
|
707
709
|
});
|
|
708
710
|
};
|
|
709
|
-
var RangePicker = /*#__PURE__*/_react.
|
|
711
|
+
var RangePicker = /*#__PURE__*/(0, _react.forwardRef)(InternalRangePicker);
|
|
710
712
|
RangePicker.displayName = 'RangePicker';
|
|
711
713
|
var _default = RangePicker;
|
|
712
714
|
exports.default = _default;
|
|
@@ -27,7 +27,6 @@ export interface AbstractSelectProps extends PopperProps {
|
|
|
27
27
|
id?: string;
|
|
28
28
|
children?: React.ReactNode;
|
|
29
29
|
options?: OptionsType[];
|
|
30
|
-
loading?: boolean;
|
|
31
30
|
clearIcon?: React.ReactNode;
|
|
32
31
|
searchIcon?: React.ReactNode;
|
|
33
32
|
suffixIcon?: React.ReactNode;
|
|
@@ -56,6 +55,7 @@ export interface ISelectProps<T extends SelectValue> extends AbstractSelectProps
|
|
|
56
55
|
autoFocus?: boolean;
|
|
57
56
|
onChange?: (value?: T, option?: React.ReactElement<any> | React.ReactElement<any>[]) => void;
|
|
58
57
|
onSelect?: (value?: T extends (infer I)[] ? I : T, option?: React.ReactElement<any>) => void;
|
|
58
|
+
onDeselect?: (value?: T extends (infer I)[] ? I : T, option?: React.ReactElement<any>) => void;
|
|
59
59
|
onBlur?: (value?: T) => void;
|
|
60
60
|
onFocus?: () => void;
|
|
61
61
|
onSearch?: (value?: string) => void;
|
package/lib/select/select.js
CHANGED
|
@@ -113,6 +113,10 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
113
113
|
_useState10 = (0, _slicedToArray2.default)(_useState9, 2),
|
|
114
114
|
inputWidth = _useState10[0],
|
|
115
115
|
setInputWidth = _useState10[1]; // 输入框宽度
|
|
116
|
+
var _useState11 = (0, _react.useState)(autoFocus),
|
|
117
|
+
_useState12 = (0, _slicedToArray2.default)(_useState11, 2),
|
|
118
|
+
focusd = _useState12[0],
|
|
119
|
+
setFocusd = _useState12[1];
|
|
116
120
|
var selectPrefixCls = getPrefixCls(prefixCls, 'select', customPrefixcls);
|
|
117
121
|
// 选择器样式
|
|
118
122
|
var selectCls = (0, _classnames.default)(selectPrefixCls, className, (0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-visible"), optionShow));
|
|
@@ -196,10 +200,12 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
196
200
|
}, [optionShow]);
|
|
197
201
|
var handleFocus = (0, _react.useCallback)(function (e) {
|
|
198
202
|
e.stopPropagation();
|
|
203
|
+
setFocusd(true);
|
|
199
204
|
onFocus && onFocus(e);
|
|
200
205
|
}, [onFocus]);
|
|
201
206
|
var handleBlur = (0, _react.useCallback)(function (e) {
|
|
202
207
|
e.stopPropagation();
|
|
208
|
+
setFocusd(false);
|
|
203
209
|
onBlur && onBlur(e);
|
|
204
210
|
}, [onBlur]);
|
|
205
211
|
// 点击组件
|
|
@@ -251,7 +257,7 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
251
257
|
}, [searchValue, realChildren, filterOption, optionFilterProp]);
|
|
252
258
|
var getOptionLabel = (0, _react.useCallback)(function (obj) {
|
|
253
259
|
var _a;
|
|
254
|
-
var text = 'options'
|
|
260
|
+
var text = Object.prototype.hasOwnProperty.call(selectProps, 'options') && !Object.prototype.hasOwnProperty.call(props, 'optionLabelProp') ? 'label' : optionLabelProp;
|
|
255
261
|
if (obj.props) {
|
|
256
262
|
if (text) {
|
|
257
263
|
return obj === null || obj === void 0 ? void 0 : obj.props[text];
|
|
@@ -395,6 +401,7 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
395
401
|
// 输入框变化搜索内容
|
|
396
402
|
var handleSearchChange = (0, _react.useCallback)(function (event) {
|
|
397
403
|
var val = event.currentTarget.value;
|
|
404
|
+
setOptionShow(true);
|
|
398
405
|
setSearchValue(val);
|
|
399
406
|
onSearch === null || onSearch === void 0 ? void 0 : onSearch(val);
|
|
400
407
|
}, [onSearch]);
|
|
@@ -447,9 +454,9 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
447
454
|
return e.preventDefault();
|
|
448
455
|
},
|
|
449
456
|
className: clearIconCls
|
|
450
|
-
}, /*#__PURE__*/_react.default.createElement(_index.Icon, {
|
|
457
|
+
}, clearIcon || /*#__PURE__*/_react.default.createElement(_index.Icon, {
|
|
451
458
|
type: "close-solid"
|
|
452
|
-
})
|
|
459
|
+
})), showArrow && /*#__PURE__*/_react.default.createElement("span", {
|
|
453
460
|
className: arrowIconCls
|
|
454
461
|
}, suffixIcon || /*#__PURE__*/_react.default.createElement(_index.Icon, {
|
|
455
462
|
type: "arrow-down"
|
|
@@ -495,6 +502,12 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
495
502
|
var isShowSearch = (0, _react.useMemo)(function () {
|
|
496
503
|
return (0, _isBoolean.default)(showSearch) ? showSearch : isMultiple;
|
|
497
504
|
}, [isMultiple, showSearch]);
|
|
505
|
+
(0, _react.useEffect)(function () {
|
|
506
|
+
var _a;
|
|
507
|
+
if (isShowSearch && autoFocus && !disabled) {
|
|
508
|
+
(_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
|
|
509
|
+
}
|
|
510
|
+
}, [isShowSearch, autoFocus, disabled]);
|
|
498
511
|
// 渲染下拉列表框
|
|
499
512
|
var renderContent = function renderContent() {
|
|
500
513
|
var dropdownRender = selectProps.dropdownRender,
|
|
@@ -617,7 +630,7 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
617
630
|
var _context3, _classNames10, _context4, _classNames11;
|
|
618
631
|
var maxTagCount = selectProps.maxTagCount,
|
|
619
632
|
maxTagPlaceholder = selectProps.maxTagPlaceholder;
|
|
620
|
-
var multipleCls = (0, _classnames.default)(commCls, (_classNames10 = {}, (0, _defineProperty2.default)(_classNames10, "".concat(selectPrefixCls, "-multiple-disabled"), disabled), (0, _defineProperty2.default)(_classNames10, (0, _concat.default)(_context3 = "".concat(selectPrefixCls, "-")).call(_context3, mode), mode), (0, _defineProperty2.default)(_classNames10, "".concat(selectPrefixCls, "-focused"),
|
|
633
|
+
var multipleCls = (0, _classnames.default)(commCls, (_classNames10 = {}, (0, _defineProperty2.default)(_classNames10, "".concat(selectPrefixCls, "-multiple-disabled"), disabled), (0, _defineProperty2.default)(_classNames10, (0, _concat.default)(_context3 = "".concat(selectPrefixCls, "-")).call(_context3, mode), mode), (0, _defineProperty2.default)(_classNames10, "".concat(selectPrefixCls, "-focused"), focusd || optionShow), (0, _defineProperty2.default)(_classNames10, "".concat(selectPrefixCls, "-placeholder"), placeholder && !mulOptions.length), _classNames10));
|
|
621
634
|
var itemCls = (0, _classnames.default)((_classNames11 = {}, (0, _defineProperty2.default)(_classNames11, "".concat(selectPrefixCls, "-selection-item"), true), (0, _defineProperty2.default)(_classNames11, (0, _concat.default)(_context4 = "".concat(selectPrefixCls, "-selection-item-")).call(_context4, size), size), _classNames11));
|
|
622
635
|
var TagStyle = {
|
|
623
636
|
margin: '2px 8px 2px 0',
|
|
@@ -678,7 +691,7 @@ var InternalSelect = function InternalSelect(props, ref) {
|
|
|
678
691
|
className: "".concat(selectPrefixCls, "-suffix")
|
|
679
692
|
}, renderSuffix()));
|
|
680
693
|
};
|
|
681
|
-
var singleCls = (0, _classnames.default)(commCls, (_classNames12 = {}, (0, _defineProperty2.default)(_classNames12, "".concat(selectPrefixCls, "-single"), true), (0, _defineProperty2.default)(_classNames12, "".concat(selectPrefixCls, "-single-disabled"), disabled), (0, _defineProperty2.default)(_classNames12, "".concat(selectPrefixCls, "-single-focused"),
|
|
694
|
+
var singleCls = (0, _classnames.default)(commCls, (_classNames12 = {}, (0, _defineProperty2.default)(_classNames12, "".concat(selectPrefixCls, "-single"), true), (0, _defineProperty2.default)(_classNames12, "".concat(selectPrefixCls, "-single-disabled"), disabled), (0, _defineProperty2.default)(_classNames12, "".concat(selectPrefixCls, "-single-focused"), focusd && !disabled || optionShow), _classNames12));
|
|
682
695
|
var renderSelect = function renderSelect() {
|
|
683
696
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
684
697
|
className: selectCls,
|
|
@@ -53,6 +53,7 @@ var flattenAll = function flattenAll(treeData) {
|
|
|
53
53
|
var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
|
|
54
54
|
treeData && treeData.forEach(function (item, index) {
|
|
55
55
|
var _context, _context2;
|
|
56
|
+
var _a;
|
|
56
57
|
var children = item.children,
|
|
57
58
|
title = item.title,
|
|
58
59
|
key = item.key,
|
|
@@ -66,7 +67,7 @@ var flattenAll = function flattenAll(treeData) {
|
|
|
66
67
|
hasChildNode: hasChildNode,
|
|
67
68
|
children: children,
|
|
68
69
|
level: level,
|
|
69
|
-
parentKey: (parent === null || parent === void 0 ? void 0 : parent.key) || null,
|
|
70
|
+
parentKey: ((_a = parent === null || parent === void 0 ? void 0 : parent.key) !== null && _a !== void 0 ? _a : '') !== '' ? parent === null || parent === void 0 ? void 0 : parent.key : null,
|
|
70
71
|
pathParentKeys: parent ? (0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)((parent === null || parent === void 0 ? void 0 : parent.pathParentKeys) || []), [parent === null || parent === void 0 ? void 0 : parent.key]) : []
|
|
71
72
|
}, others);
|
|
72
73
|
keysData[key] = flattenNode;
|
|
@@ -147,11 +148,8 @@ var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData)
|
|
|
147
148
|
filterKeys.forEach(function (item) {
|
|
148
149
|
var node = (0, _extends2.default)({}, item);
|
|
149
150
|
while (node) {
|
|
150
|
-
var _context3;
|
|
151
151
|
allFilterKeys.add(node.key);
|
|
152
|
-
|
|
153
|
-
return i.key;
|
|
154
|
-
})).call(_context3, node.key) && filterExpandKeys.add(node.key);
|
|
152
|
+
filterExpandKeys.add(node.key);
|
|
155
153
|
node = (keysData === null || keysData === void 0 ? void 0 : keysData[node === null || node === void 0 ? void 0 : node.parentKey]) || null;
|
|
156
154
|
}
|
|
157
155
|
});
|
|
@@ -298,10 +296,10 @@ var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
|
|
|
298
296
|
};
|
|
299
297
|
exports.getSpreadAttrData = getSpreadAttrData;
|
|
300
298
|
var addKeys = function addKeys() {
|
|
301
|
-
var
|
|
299
|
+
var _context3;
|
|
302
300
|
var prevKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
303
301
|
var newKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
304
|
-
return (0, _from.default)(new _set.default((0, _concat.default)(
|
|
302
|
+
return (0, _from.default)(new _set.default((0, _concat.default)(_context3 = []).call(_context3, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
|
|
305
303
|
};
|
|
306
304
|
exports.addKeys = addKeys;
|
|
307
305
|
var getAllParentKeys = function getAllParentKeys(data) {
|
|
@@ -352,13 +350,13 @@ var getPos = function getPos(data, key) {
|
|
|
352
350
|
};
|
|
353
351
|
exports.getPos = getPos;
|
|
354
352
|
var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
|
|
355
|
-
var
|
|
353
|
+
var _context4;
|
|
356
354
|
var checkedKeys = [];
|
|
357
355
|
keys.forEach(function (item) {
|
|
358
356
|
var pos = getPos(data, item);
|
|
359
357
|
checkedKeys.push.apply(checkedKeys, (0, _toConsumableArray2.default)(getAllChildKeys(data, pos)));
|
|
360
358
|
});
|
|
361
|
-
return (0, _from.default)(new _set.default((0, _concat.default)(
|
|
359
|
+
return (0, _from.default)(new _set.default((0, _concat.default)(_context4 = []).call(_context4, checkedKeys, (0, _toConsumableArray2.default)(keys))));
|
|
362
360
|
};
|
|
363
361
|
exports.getInitCheckedKeys = getInitCheckedKeys;
|
|
364
362
|
var getInitCheckededState = function getInitCheckededState(data) {
|
|
@@ -454,7 +452,7 @@ var updateParent = function updateParent(key, keysNodeProps, allKeys, halfChecke
|
|
|
454
452
|
});
|
|
455
453
|
};
|
|
456
454
|
var getInitCheckededKeys = function getInitCheckededKeys() {
|
|
457
|
-
var
|
|
455
|
+
var _context5;
|
|
458
456
|
var checkedKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
459
457
|
var keysNodeProps = arguments.length > 1 ? arguments[1] : undefined;
|
|
460
458
|
var checkedKeysSet = new _set.default(checkedKeys || []);
|
|
@@ -474,7 +472,7 @@ var getInitCheckededKeys = function getInitCheckededKeys() {
|
|
|
474
472
|
}
|
|
475
473
|
});
|
|
476
474
|
return {
|
|
477
|
-
checkedKeys: (0, _toConsumableArray2.default)(new _set.default((0, _concat.default)(
|
|
475
|
+
checkedKeys: (0, _toConsumableArray2.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, (0, _toConsumableArray2.default)(checkedKeysSet), (0, _toConsumableArray2.default)(childCheckedKeysSet)))),
|
|
478
476
|
halfCheckedKeys: (0, _toConsumableArray2.default)(halfCheckedKeysSet)
|
|
479
477
|
};
|
|
480
478
|
};
|
|
@@ -642,8 +640,8 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
|
|
|
642
640
|
}
|
|
643
641
|
}
|
|
644
642
|
if (isSearching) {
|
|
645
|
-
var
|
|
646
|
-
keys = (0, _concat.default)(
|
|
643
|
+
var _context6;
|
|
644
|
+
keys = (0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(searchExpandedKeys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
|
|
647
645
|
}
|
|
648
646
|
return (0, _from.default)(new _set.default((0, _toConsumableArray2.default)(keys)));
|
|
649
647
|
};
|
package/lib/upload/upload.d.ts
CHANGED
package/lib/upload/upload.js
CHANGED
|
@@ -19,7 +19,7 @@ var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
|
|
|
19
19
|
var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
|
|
20
20
|
var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
|
|
21
21
|
var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
|
|
22
|
-
var
|
|
22
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
23
23
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
24
24
|
var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
|
|
25
25
|
var _utils = require("../_utils");
|
|
@@ -85,11 +85,11 @@ function abort(file) {
|
|
|
85
85
|
}
|
|
86
86
|
var InternalUpload = function InternalUpload(props, ref) {
|
|
87
87
|
var _context5, _classNames, _context6, _context7;
|
|
88
|
-
var _React$useContext =
|
|
88
|
+
var _React$useContext = _react.default.useContext(_ConfigContext.default),
|
|
89
89
|
getPrefixCls = _React$useContext.getPrefixCls,
|
|
90
90
|
pkgPrefixCls = _React$useContext.prefixCls,
|
|
91
91
|
userDefaultProps = _React$useContext.compDefaultProps;
|
|
92
|
-
var innerRef =
|
|
92
|
+
var innerRef = _react.default.useRef();
|
|
93
93
|
var mergedRef = ref || innerRef;
|
|
94
94
|
var allProps = (0, _utils.getCompProps)('Upload', userDefaultProps, props); // 属性需要合并一遍用户定义的默认属性
|
|
95
95
|
var type = allProps.type,
|
|
@@ -105,14 +105,15 @@ var InternalUpload = function InternalUpload(props, ref) {
|
|
|
105
105
|
itemRender = allProps.itemRender,
|
|
106
106
|
showUploadList = allProps.showUploadList,
|
|
107
107
|
customPrefixcls = allProps.prefixCls;
|
|
108
|
-
var _React$useState =
|
|
108
|
+
var _React$useState = _react.default.useState(props.fileList || props.defaultFileList || []),
|
|
109
109
|
_React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
|
|
110
110
|
fileList = _React$useState2[0],
|
|
111
111
|
setFileList = _React$useState2[1];
|
|
112
|
-
|
|
112
|
+
var hasChildren = children && _react.Children.toArray(children).length > 0;
|
|
113
|
+
_react.default.useEffect(function () {
|
|
113
114
|
props.fileList && setFileList(props.fileList);
|
|
114
115
|
}, [props.fileList]);
|
|
115
|
-
|
|
116
|
+
_react.default.useEffect(function () {
|
|
116
117
|
return abort;
|
|
117
118
|
}, []);
|
|
118
119
|
var onClick = function onClick(e) {
|
|
@@ -320,7 +321,7 @@ var InternalUpload = function InternalUpload(props, ref) {
|
|
|
320
321
|
webkitdirectory: directory ? 'webkitdirectory' : undefined
|
|
321
322
|
};
|
|
322
323
|
var dragEvents = {};
|
|
323
|
-
var _React$useState3 =
|
|
324
|
+
var _React$useState3 = _react.default.useState(false),
|
|
324
325
|
_React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
|
|
325
326
|
hover = _React$useState4[0],
|
|
326
327
|
setHover = _React$useState4[1];
|
|
@@ -359,7 +360,7 @@ var InternalUpload = function InternalUpload(props, ref) {
|
|
|
359
360
|
dragEvents.onDragOver = onFileLeave;
|
|
360
361
|
dragEvents.onDragLeave = onFileLeave;
|
|
361
362
|
}
|
|
362
|
-
|
|
363
|
+
_react.default.useEffect(function () {
|
|
363
364
|
if (type === 'drag') {
|
|
364
365
|
var stopDrop = function stopDrop(e) {
|
|
365
366
|
return e.preventDefault();
|
|
@@ -372,46 +373,46 @@ var InternalUpload = function InternalUpload(props, ref) {
|
|
|
372
373
|
};
|
|
373
374
|
}
|
|
374
375
|
}, [type]);
|
|
375
|
-
return /*#__PURE__*/
|
|
376
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
376
377
|
className: (0, _classnames.default)(prefixCls, {
|
|
377
378
|
disabled: disabled
|
|
378
379
|
}, className),
|
|
379
380
|
style: style
|
|
380
|
-
}, listType === 'text' && /*#__PURE__*/
|
|
381
|
+
}, listType === 'text' && hasChildren && /*#__PURE__*/_react.default.createElement("label", (0, _extends2.default)({
|
|
381
382
|
className: (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context5 = "".concat(prefixCls, "-")).call(_context5, type), true), (0, _defineProperty2.default)(_classNames, "hover", hover), _classNames))
|
|
382
|
-
}, dragEvents), /*#__PURE__*/
|
|
383
|
+
}, dragEvents), /*#__PURE__*/_react.default.createElement("span", {
|
|
383
384
|
className: "".concat(prefixCls, "-handle")
|
|
384
|
-
}, children), /*#__PURE__*/
|
|
385
|
+
}, children), /*#__PURE__*/_react.default.createElement("span", {
|
|
385
386
|
className: "".concat(prefixCls, "-input")
|
|
386
|
-
}, /*#__PURE__*/
|
|
387
|
+
}, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
|
|
387
388
|
title: "",
|
|
388
389
|
type: "file"
|
|
389
390
|
}, inputFileProps, {
|
|
390
391
|
ref: mergedRef
|
|
391
|
-
})))), (listType === 'picture' || !(listType === 'text' && (!showUploadList || !fileList.length))) && /*#__PURE__*/
|
|
392
|
+
})))), (listType === 'picture' || !(listType === 'text' && (!showUploadList || !fileList.length))) && /*#__PURE__*/_react.default.createElement("ul", {
|
|
392
393
|
className: (0, _concat.default)(_context6 = "".concat(prefixCls, "-")).call(_context6, listType, "-list")
|
|
393
|
-
}, listType === 'picture' &&
|
|
394
|
+
}, listType === 'picture' && hasChildren && /*#__PURE__*/_react.default.createElement("li", {
|
|
394
395
|
className: (0, _classnames.default)((0, _concat.default)(_context7 = "".concat(prefixCls, "-")).call(_context7, listType, "-list-item"))
|
|
395
|
-
}, /*#__PURE__*/
|
|
396
|
+
}, /*#__PURE__*/_react.default.createElement("label", {
|
|
396
397
|
className: "".concat(prefixCls, "-select")
|
|
397
|
-
}, /*#__PURE__*/
|
|
398
|
+
}, /*#__PURE__*/_react.default.createElement("span", {
|
|
398
399
|
className: "".concat(prefixCls, "-handle")
|
|
399
|
-
}, children), /*#__PURE__*/
|
|
400
|
+
}, children), /*#__PURE__*/_react.default.createElement("span", {
|
|
400
401
|
className: "".concat(prefixCls, "-input")
|
|
401
|
-
}, /*#__PURE__*/
|
|
402
|
+
}, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
|
|
402
403
|
title: "",
|
|
403
404
|
type: "file"
|
|
404
405
|
}, inputFileProps, {
|
|
405
406
|
ref: mergedRef
|
|
406
407
|
}))))), showUploadList && (0, _map.default)(fileList).call(fileList, function (file) {
|
|
407
|
-
return itemRender ? itemRender( /*#__PURE__*/
|
|
408
|
+
return itemRender ? itemRender( /*#__PURE__*/_react.default.createElement(Item, (0, _extends2.default)({}, {
|
|
408
409
|
file: file,
|
|
409
410
|
prefixCls: prefixCls,
|
|
410
411
|
listType: listType,
|
|
411
412
|
handleReUpload: handleReUpload,
|
|
412
413
|
handleRemove: handleRemove,
|
|
413
414
|
disabled: disabled
|
|
414
|
-
})), file, setFileList) : /*#__PURE__*/
|
|
415
|
+
})), file, setFileList) : /*#__PURE__*/_react.default.createElement(Item, (0, _extends2.default)({
|
|
415
416
|
key: file.uid
|
|
416
417
|
}, {
|
|
417
418
|
file: file,
|
|
@@ -438,56 +439,56 @@ var Item = function Item(_ref3) {
|
|
|
438
439
|
success: 'attachment',
|
|
439
440
|
notStart: 'attachment'
|
|
440
441
|
};
|
|
441
|
-
return /*#__PURE__*/
|
|
442
|
+
return /*#__PURE__*/_react.default.createElement("li", {
|
|
442
443
|
className: (0, _classnames.default)((0, _concat.default)(_context8 = "".concat(prefixCls, "-")).call(_context8, listType, "-list-item"), {
|
|
443
444
|
error: file.status === 'error'
|
|
444
445
|
})
|
|
445
|
-
}, listType === 'text' ? /*#__PURE__*/
|
|
446
|
+
}, listType === 'text' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
|
|
446
447
|
className: (0, _concat.default)(_context9 = "".concat(prefixCls, "-")).call(_context9, listType, "-list-item-icon")
|
|
447
|
-
}, /*#__PURE__*/
|
|
448
|
+
}, /*#__PURE__*/_react.default.createElement(_icon.default, {
|
|
448
449
|
spin: file.status === 'uploading',
|
|
449
450
|
type: mapStatus[file.status]
|
|
450
|
-
})), /*#__PURE__*/
|
|
451
|
+
})), /*#__PURE__*/_react.default.createElement("span", {
|
|
451
452
|
className: (0, _concat.default)(_context10 = "".concat(prefixCls, "-")).call(_context10, listType, "-list-item-name"),
|
|
452
453
|
title: file.name
|
|
453
|
-
}, file.name), /*#__PURE__*/
|
|
454
|
+
}, file.name), /*#__PURE__*/_react.default.createElement("span", {
|
|
454
455
|
className: (0, _concat.default)(_context11 = "".concat(prefixCls, "-")).call(_context11, listType, "-list-item-size")
|
|
455
|
-
}, "(", (0, _utils2.getFileSize)(file.size), ")"), /*#__PURE__*/
|
|
456
|
+
}, "(", (0, _utils2.getFileSize)(file.size), ")"), /*#__PURE__*/_react.default.createElement("div", {
|
|
456
457
|
className: (0, _concat.default)(_context12 = "".concat(prefixCls, "-")).call(_context12, listType, "-list-item-action")
|
|
457
|
-
}, file.status === 'error' && /*#__PURE__*/
|
|
458
|
+
}, file.status === 'error' && /*#__PURE__*/_react.default.createElement("a", {
|
|
458
459
|
href: "true",
|
|
459
460
|
className: (0, _concat.default)(_context13 = "".concat(prefixCls, "-")).call(_context13, listType, "-list-item-reupload"),
|
|
460
461
|
onClick: handleReUpload.bind(_this, file)
|
|
461
|
-
}, "\u91CD\u65B0\u4E0A\u4F20"), !disabled && /*#__PURE__*/
|
|
462
|
+
}, "\u91CD\u65B0\u4E0A\u4F20"), !disabled && /*#__PURE__*/_react.default.createElement("a", {
|
|
462
463
|
href: "true",
|
|
463
464
|
className: (0, _concat.default)(_context14 = "".concat(prefixCls, "-")).call(_context14, listType, "-list-item-delete"),
|
|
464
465
|
onClick: handleRemove.bind(_this, file)
|
|
465
|
-
}, "\u5220\u9664"))) : file.status === 'uploading' ? /*#__PURE__*/
|
|
466
|
+
}, "\u5220\u9664"))) : file.status === 'uploading' ? /*#__PURE__*/_react.default.createElement("div", {
|
|
466
467
|
className: (0, _concat.default)(_context15 = "".concat(prefixCls, "-")).call(_context15, listType, "-list-item-loading")
|
|
467
|
-
}, /*#__PURE__*/
|
|
468
|
+
}, /*#__PURE__*/_react.default.createElement(_progress.default, {
|
|
468
469
|
percent: file.percent,
|
|
469
470
|
textMap: ['文件上传中'],
|
|
470
471
|
showInfo: false
|
|
471
|
-
})) : file.status === 'error' ? /*#__PURE__*/
|
|
472
|
+
})) : file.status === 'error' ? /*#__PURE__*/_react.default.createElement("div", {
|
|
472
473
|
className: (0, _concat.default)(_context16 = "".concat(prefixCls, "-")).call(_context16, listType, "-list-item-error")
|
|
473
|
-
}, /*#__PURE__*/
|
|
474
|
+
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
474
475
|
className: (0, _concat.default)(_context17 = "".concat(prefixCls, "-")).call(_context17, listType, "-list-item-error-text")
|
|
475
|
-
}, /*#__PURE__*/
|
|
476
|
+
}, /*#__PURE__*/_react.default.createElement(_icon.default, {
|
|
476
477
|
type: mapStatus[file.status],
|
|
477
478
|
style: {
|
|
478
479
|
verticalAlign: 'top'
|
|
479
480
|
}
|
|
480
|
-
}), "\u4E0A\u4F20\u5931\u8D25"), !disabled && /*#__PURE__*/
|
|
481
|
+
}), "\u4E0A\u4F20\u5931\u8D25"), !disabled && /*#__PURE__*/_react.default.createElement("div", {
|
|
481
482
|
className: (0, _concat.default)(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-action")
|
|
482
|
-
}, /*#__PURE__*/
|
|
483
|
+
}, /*#__PURE__*/_react.default.createElement("a", {
|
|
483
484
|
href: "true",
|
|
484
485
|
className: (0, _concat.default)(_context19 = "".concat(prefixCls, "-")).call(_context19, listType, "-list-item-reupload"),
|
|
485
486
|
onClick: handleReUpload.bind(_this, file)
|
|
486
|
-
}, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/
|
|
487
|
+
}, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/_react.default.createElement("a", {
|
|
487
488
|
href: "true",
|
|
488
489
|
className: (0, _concat.default)(_context20 = "".concat(prefixCls, "-")).call(_context20, listType, "-list-item-delete"),
|
|
489
490
|
onClick: handleRemove.bind(_this, file)
|
|
490
|
-
}, "\u5220\u9664"))) : /*#__PURE__*/
|
|
491
|
+
}, "\u5220\u9664"))) : /*#__PURE__*/_react.default.createElement(_image.default, {
|
|
491
492
|
previewType: "upload",
|
|
492
493
|
name: file.name,
|
|
493
494
|
size: (0, _utils2.getFileSize)(file.size),
|
|
@@ -496,14 +497,14 @@ var Item = function Item(_ref3) {
|
|
|
496
497
|
width: '100%',
|
|
497
498
|
height: '100%'
|
|
498
499
|
},
|
|
499
|
-
operations: disabled ? [] : [/*#__PURE__*/
|
|
500
|
+
operations: disabled ? [] : [/*#__PURE__*/_react.default.createElement(_icon.default, {
|
|
500
501
|
key: "1",
|
|
501
502
|
type: "delete",
|
|
502
503
|
onClick: handleRemove.bind(_this, file)
|
|
503
504
|
})]
|
|
504
505
|
}));
|
|
505
506
|
};
|
|
506
|
-
var Upload = /*#__PURE__*/
|
|
507
|
+
var Upload = /*#__PURE__*/_react.default.forwardRef(InternalUpload);
|
|
507
508
|
Upload.displayName = 'Upload';
|
|
508
509
|
var _default = Upload;
|
|
509
510
|
exports.default = _default;
|