@kdcloudjs/kdesign 1.6.39 → 1.6.40

package/es/button/button.js

@@ -53,8 +53,8 @@ var InternalButton = function InternalButton(props, ref) {
    * @param {React.MouseEvent<HTMLButtonElement | HTMLAnchorElement, MouseEvent>} e 事件对象
    */
   var handleClick = function handleClick(e) {
-    if (loading) {
-      // 加载中不触发点击事件
+    if (loading || disabled) {
+      // 加载中和禁用状态不触发点击事件
       return;
     }
     var waveStatus = buttonRef.current.getAttribute('click-animating-wave');

package/es/input/ClearableLabeledInput.js

@@ -61,7 +61,7 @@ var ClearableInput = function ClearableInput(props) {
         style: {
           marginRight: suffix ? 9 : 0
         }
-      }, inputCount), /*#__PURE__*/React.createElement("span", null, suffix));
+      }, inputCount), suffix);
     }
     return null;
   };

package/es/select/interface.d.ts

@@ -27,7 +27,6 @@ export interface AbstractSelectProps extends PopperProps {
     id?: string;
     children?: React.ReactNode;
     options?: OptionsType[];
-    loading?: boolean;
     clearIcon?: React.ReactNode;
     searchIcon?: React.ReactNode;
     suffixIcon?: React.ReactNode;
@@ -56,6 +55,7 @@ export interface ISelectProps<T extends SelectValue> extends AbstractSelectProps
     autoFocus?: boolean;
     onChange?: (value?: T, option?: React.ReactElement<any> | React.ReactElement<any>[]) => void;
     onSelect?: (value?: T extends (infer I)[] ? I : T, option?: React.ReactElement<any>) => void;
+    onDeselect?: (value?: T extends (infer I)[] ? I : T, option?: React.ReactElement<any>) => void;
     onBlur?: (value?: T) => void;
     onFocus?: () => void;
     onSearch?: (value?: string) => void;

package/es/select/select.js

@@ -101,6 +101,10 @@ var InternalSelect = function InternalSelect(props, ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     inputWidth = _useState10[0],
     setInputWidth = _useState10[1]; // 输入框宽度
+  var _useState11 = useState(autoFocus),
+    _useState12 = _slicedToArray(_useState11, 2),
+    focusd = _useState12[0],
+    setFocusd = _useState12[1];
   var selectPrefixCls = getPrefixCls(prefixCls, 'select', customPrefixcls);
   // 选择器样式
   var selectCls = classNames(selectPrefixCls, className, _defineProperty({}, "".concat(selectPrefixCls, "-visible"), optionShow));
@@ -184,10 +188,12 @@ var InternalSelect = function InternalSelect(props, ref) {
   }, [optionShow]);
   var handleFocus = useCallback(function (e) {
     e.stopPropagation();
+    setFocusd(true);
     onFocus && onFocus(e);
   }, [onFocus]);
   var handleBlur = useCallback(function (e) {
     e.stopPropagation();
+    setFocusd(false);
     onBlur && onBlur(e);
   }, [onBlur]);
   // 点击组件
@@ -239,7 +245,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   }, [searchValue, realChildren, filterOption, optionFilterProp]);
   var getOptionLabel = useCallback(function (obj) {
     var _a;
-    var text = 'options' in selectProps ? 'label' : optionLabelProp;
+    var text = Object.prototype.hasOwnProperty.call(selectProps, 'options') && !Object.prototype.hasOwnProperty.call(props, 'optionLabelProp') ? 'label' : optionLabelProp;
     if (obj.props) {
       if (text) {
         return obj === null || obj === void 0 ? void 0 : obj.props[text];
@@ -383,6 +389,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   // 输入框变化搜索内容
   var handleSearchChange = useCallback(function (event) {
     var val = event.currentTarget.value;
+    setOptionShow(true);
     setSearchValue(val);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(val);
   }, [onSearch]);
@@ -435,9 +442,9 @@ var InternalSelect = function InternalSelect(props, ref) {
         return e.preventDefault();
       },
       className: clearIconCls
-    }, /*#__PURE__*/React.createElement(Icon, {
+    }, clearIcon || /*#__PURE__*/React.createElement(Icon, {
       type: "close-solid"
-    }) || clearIcon), showArrow && /*#__PURE__*/React.createElement("span", {
+    })), showArrow && /*#__PURE__*/React.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/React.createElement(Icon, {
       type: "arrow-down"
@@ -483,6 +490,12 @@ var InternalSelect = function InternalSelect(props, ref) {
   var isShowSearch = useMemo(function () {
     return isBoolean(showSearch) ? showSearch : isMultiple;
   }, [isMultiple, showSearch]);
+  useEffect(function () {
+    var _a;
+    if (isShowSearch && autoFocus && !disabled) {
+      (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    }
+  }, [isShowSearch, autoFocus, disabled]);
   // 渲染下拉列表框
   var renderContent = function renderContent() {
     var dropdownRender = selectProps.dropdownRender,
@@ -605,7 +618,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     var _context3, _classNames10, _context4, _classNames11;
     var maxTagCount = selectProps.maxTagCount,
       maxTagPlaceholder = selectProps.maxTagPlaceholder;
-    var multipleCls = classNames(commCls, (_classNames10 = {}, _defineProperty(_classNames10, "".concat(selectPrefixCls, "-multiple-disabled"), disabled), _defineProperty(_classNames10, _concatInstanceProperty(_context3 = "".concat(selectPrefixCls, "-")).call(_context3, mode), mode), _defineProperty(_classNames10, "".concat(selectPrefixCls, "-focused"), autoFocus || optionShow), _defineProperty(_classNames10, "".concat(selectPrefixCls, "-placeholder"), placeholder && !mulOptions.length), _classNames10));
+    var multipleCls = classNames(commCls, (_classNames10 = {}, _defineProperty(_classNames10, "".concat(selectPrefixCls, "-multiple-disabled"), disabled), _defineProperty(_classNames10, _concatInstanceProperty(_context3 = "".concat(selectPrefixCls, "-")).call(_context3, mode), mode), _defineProperty(_classNames10, "".concat(selectPrefixCls, "-focused"), focusd || optionShow), _defineProperty(_classNames10, "".concat(selectPrefixCls, "-placeholder"), placeholder && !mulOptions.length), _classNames10));
     var itemCls = classNames((_classNames11 = {}, _defineProperty(_classNames11, "".concat(selectPrefixCls, "-selection-item"), true), _defineProperty(_classNames11, _concatInstanceProperty(_context4 = "".concat(selectPrefixCls, "-selection-item-")).call(_context4, size), size), _classNames11));
     var TagStyle = {
       margin: '2px 8px 2px 0',
@@ -666,7 +679,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: "".concat(selectPrefixCls, "-suffix")
     }, renderSuffix()));
   };
-  var singleCls = classNames(commCls, (_classNames12 = {}, _defineProperty(_classNames12, "".concat(selectPrefixCls, "-single"), true), _defineProperty(_classNames12, "".concat(selectPrefixCls, "-single-disabled"), disabled), _defineProperty(_classNames12, "".concat(selectPrefixCls, "-single-focused"), autoFocus && !disabled || optionShow), _classNames12));
+  var singleCls = classNames(commCls, (_classNames12 = {}, _defineProperty(_classNames12, "".concat(selectPrefixCls, "-single"), true), _defineProperty(_classNames12, "".concat(selectPrefixCls, "-single-disabled"), disabled), _defineProperty(_classNames12, "".concat(selectPrefixCls, "-single-focused"), focusd && !disabled || optionShow), _classNames12));
   var renderSelect = function renderSelect() {
     return /*#__PURE__*/React.createElement("div", {
       className: selectCls,

package/es/tree/utils/treeUtils.js

@@ -40,6 +40,7 @@ export var flattenAll = function flattenAll(treeData) {
     var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
     treeData && treeData.forEach(function (item, index) {
       var _context, _context2;
+      var _a;
       var children = item.children,
         title = item.title,
         key = item.key,
@@ -53,7 +54,7 @@ export var flattenAll = function flattenAll(treeData) {
         hasChildNode: hasChildNode,
         children: children,
         level: level,
-        parentKey: (parent === null || parent === void 0 ? void 0 : parent.key) || null,
+        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,
         pathParentKeys: parent ? _concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray((parent === null || parent === void 0 ? void 0 : parent.pathParentKeys) || []), [parent === null || parent === void 0 ? void 0 : parent.key]) : []
       }, others);
       keysData[key] = flattenNode;
@@ -129,11 +130,8 @@ export var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, ke
   filterKeys.forEach(function (item) {
     var node = _extends({}, item);
     while (node) {
-      var _context3;
       allFilterKeys.add(node.key);
-      !_includesInstanceProperty(_context3 = _mapInstanceProperty(filterKeys).call(filterKeys, function (i) {
-        return i.key;
-      })).call(_context3, node.key) && filterExpandKeys.add(node.key);
+      filterExpandKeys.add(node.key);
       node = (keysData === null || keysData === void 0 ? void 0 : keysData[node === null || node === void 0 ? void 0 : node.parentKey]) || null;
     }
   });
@@ -276,10 +274,10 @@ export var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys
   };
 };
 export var addKeys = function addKeys() {
-  var _context4;
+  var _context3;
   var prevKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var newKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return _Array$from(new _Set(_concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(prevKeys), _toConsumableArray(newKeys))));
+  return _Array$from(new _Set(_concatInstanceProperty(_context3 = []).call(_context3, _toConsumableArray(prevKeys), _toConsumableArray(newKeys))));
 };
 export var getAllParentKeys = function getAllParentKeys(data) {
   var pos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -325,13 +323,13 @@ export var getPos = function getPos(data, key) {
   return node === null || node === void 0 ? void 0 : node.pos;
 };
 export var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
-  var _context5;
+  var _context4;
   var checkedKeys = [];
   keys.forEach(function (item) {
     var pos = getPos(data, item);
     checkedKeys.push.apply(checkedKeys, _toConsumableArray(getAllChildKeys(data, pos)));
   });
-  return _Array$from(new _Set(_concatInstanceProperty(_context5 = []).call(_context5, checkedKeys, _toConsumableArray(keys))));
+  return _Array$from(new _Set(_concatInstanceProperty(_context4 = []).call(_context4, checkedKeys, _toConsumableArray(keys))));
 };
 export var getInitCheckededState = function getInitCheckededState(data) {
   var checkedKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -425,7 +423,7 @@ var updateParent = function updateParent(key, keysNodeProps, allKeys, halfChecke
   });
 };
 export var getInitCheckededKeys = function getInitCheckededKeys() {
-  var _context6;
+  var _context5;
   var checkedKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var keysNodeProps = arguments.length > 1 ? arguments[1] : undefined;
   var checkedKeysSet = new _Set(checkedKeys || []);
@@ -445,7 +443,7 @@ export var getInitCheckededKeys = function getInitCheckededKeys() {
     }
   });
   return {
-    checkedKeys: _toConsumableArray(new _Set(_concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(checkedKeysSet), _toConsumableArray(childCheckedKeysSet)))),
+    checkedKeys: _toConsumableArray(new _Set(_concatInstanceProperty(_context5 = []).call(_context5, _toConsumableArray(checkedKeysSet), _toConsumableArray(childCheckedKeysSet)))),
     halfCheckedKeys: _toConsumableArray(halfCheckedKeysSet)
   };
 };
@@ -608,8 +606,8 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
     }
   }
   if (isSearching) {
-    var _context7;
-    keys = _concatInstanceProperty(_context7 = []).call(_context7, _toConsumableArray(searchExpandedKeys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
+    var _context6;
+    keys = _concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(searchExpandedKeys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
   }
   return _Array$from(new _Set(_toConsumableArray(keys)));
 };

package/es/upload/upload.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { UploadProps } from './interface';
 declare const Upload: React.ForwardRefExoticComponent<UploadProps<any> & React.RefAttributes<unknown>>;
 export default Upload;

package/es/upload/upload.js

@@ -37,7 +37,7 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
 };
-import * as React from 'react';
+import React, { Children } from 'react';
 import classNames from 'classnames';
 import ConfigContext from '../config-provider/ConfigContext';
 import { getCompProps } from '../_utils';
@@ -97,6 +97,7 @@ var InternalUpload = function InternalUpload(props, ref) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     fileList = _React$useState2[0],
     setFileList = _React$useState2[1];
+  var hasChildren = children && Children.toArray(children).length > 0;
   React.useEffect(function () {
     props.fileList && setFileList(props.fileList);
   }, [props.fileList]);
@@ -365,7 +366,7 @@ var InternalUpload = function InternalUpload(props, ref) {
       disabled: disabled
     }, className),
     style: style
-  }, listType === 'text' && /*#__PURE__*/React.createElement("label", _extends({
+  }, listType === 'text' && hasChildren && /*#__PURE__*/React.createElement("label", _extends({
     className: classNames((_classNames = {}, _defineProperty(_classNames, _concatInstanceProperty(_context5 = "".concat(prefixCls, "-")).call(_context5, type), true), _defineProperty(_classNames, "hover", hover), _classNames))
   }, dragEvents), /*#__PURE__*/React.createElement("span", {
     className: "".concat(prefixCls, "-handle")
@@ -378,7 +379,7 @@ var InternalUpload = function InternalUpload(props, ref) {
     ref: mergedRef
   })))), (listType === 'picture' || !(listType === 'text' && (!showUploadList || !fileList.length))) && /*#__PURE__*/React.createElement("ul", {
     className: _concatInstanceProperty(_context6 = "".concat(prefixCls, "-")).call(_context6, listType, "-list")
-  }, listType === 'picture' && children && /*#__PURE__*/React.createElement("li", {
+  }, listType === 'picture' && hasChildren && /*#__PURE__*/React.createElement("li", {
     className: classNames(_concatInstanceProperty(_context7 = "".concat(prefixCls, "-")).call(_context7, listType, "-list-item"))
   }, /*#__PURE__*/React.createElement("label", {
     className: "".concat(prefixCls, "-select")

package/lib/button/button.js

@@ -70,8 +70,8 @@ var InternalButton = function InternalButton(props, ref) {
    * @param {React.MouseEvent<HTMLButtonElement | HTMLAnchorElement, MouseEvent>} e 事件对象
    */
   var handleClick = function handleClick(e) {
-    if (loading) {
-      // 加载中不触发点击事件
+    if (loading || disabled) {
+      // 加载中和禁用状态不触发点击事件
       return;
     }
     var waveStatus = buttonRef.current.getAttribute('click-animating-wave');

package/lib/input/ClearableLabeledInput.js

@@ -74,7 +74,7 @@ var ClearableInput = function ClearableInput(props) {
         style: {
           marginRight: suffix ? 9 : 0
         }
-      }, inputCount), /*#__PURE__*/_react.default.createElement("span", null, suffix));
+      }, inputCount), suffix);
     }
     return null;
   };

package/lib/select/interface.d.ts

@@ -27,7 +27,6 @@ export interface AbstractSelectProps extends PopperProps {
     id?: string;
     children?: React.ReactNode;
     options?: OptionsType[];
-    loading?: boolean;
     clearIcon?: React.ReactNode;
     searchIcon?: React.ReactNode;
     suffixIcon?: React.ReactNode;
@@ -56,6 +55,7 @@ export interface ISelectProps<T extends SelectValue> extends AbstractSelectProps
     autoFocus?: boolean;
     onChange?: (value?: T, option?: React.ReactElement<any> | React.ReactElement<any>[]) => void;
     onSelect?: (value?: T extends (infer I)[] ? I : T, option?: React.ReactElement<any>) => void;
+    onDeselect?: (value?: T extends (infer I)[] ? I : T, option?: React.ReactElement<any>) => void;
     onBlur?: (value?: T) => void;
     onFocus?: () => void;
     onSearch?: (value?: string) => void;

package/lib/select/select.js

@@ -113,6 +113,10 @@ var InternalSelect = function InternalSelect(props, ref) {
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
     inputWidth = _useState10[0],
     setInputWidth = _useState10[1]; // 输入框宽度
+  var _useState11 = (0, _react.useState)(autoFocus),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    focusd = _useState12[0],
+    setFocusd = _useState12[1];
   var selectPrefixCls = getPrefixCls(prefixCls, 'select', customPrefixcls);
   // 选择器样式
   var selectCls = (0, _classnames.default)(selectPrefixCls, className, (0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-visible"), optionShow));
@@ -196,10 +200,12 @@ var InternalSelect = function InternalSelect(props, ref) {
   }, [optionShow]);
   var handleFocus = (0, _react.useCallback)(function (e) {
     e.stopPropagation();
+    setFocusd(true);
     onFocus && onFocus(e);
   }, [onFocus]);
   var handleBlur = (0, _react.useCallback)(function (e) {
     e.stopPropagation();
+    setFocusd(false);
     onBlur && onBlur(e);
   }, [onBlur]);
   // 点击组件
@@ -251,7 +257,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   }, [searchValue, realChildren, filterOption, optionFilterProp]);
   var getOptionLabel = (0, _react.useCallback)(function (obj) {
     var _a;
-    var text = 'options' in selectProps ? 'label' : optionLabelProp;
+    var text = Object.prototype.hasOwnProperty.call(selectProps, 'options') && !Object.prototype.hasOwnProperty.call(props, 'optionLabelProp') ? 'label' : optionLabelProp;
     if (obj.props) {
       if (text) {
         return obj === null || obj === void 0 ? void 0 : obj.props[text];
@@ -395,6 +401,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   // 输入框变化搜索内容
   var handleSearchChange = (0, _react.useCallback)(function (event) {
     var val = event.currentTarget.value;
+    setOptionShow(true);
     setSearchValue(val);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(val);
   }, [onSearch]);
@@ -447,9 +454,9 @@ var InternalSelect = function InternalSelect(props, ref) {
         return e.preventDefault();
       },
       className: clearIconCls
-    }, /*#__PURE__*/_react.default.createElement(_index.Icon, {
+    }, clearIcon || /*#__PURE__*/_react.default.createElement(_index.Icon, {
       type: "close-solid"
-    }) || clearIcon), showArrow && /*#__PURE__*/_react.default.createElement("span", {
+    })), showArrow && /*#__PURE__*/_react.default.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/_react.default.createElement(_index.Icon, {
       type: "arrow-down"
@@ -495,6 +502,12 @@ var InternalSelect = function InternalSelect(props, ref) {
   var isShowSearch = (0, _react.useMemo)(function () {
     return (0, _isBoolean.default)(showSearch) ? showSearch : isMultiple;
   }, [isMultiple, showSearch]);
+  (0, _react.useEffect)(function () {
+    var _a;
+    if (isShowSearch && autoFocus && !disabled) {
+      (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    }
+  }, [isShowSearch, autoFocus, disabled]);
   // 渲染下拉列表框
   var renderContent = function renderContent() {
     var dropdownRender = selectProps.dropdownRender,
@@ -617,7 +630,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     var _context3, _classNames10, _context4, _classNames11;
     var maxTagCount = selectProps.maxTagCount,
       maxTagPlaceholder = selectProps.maxTagPlaceholder;
-    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"), autoFocus || optionShow), (0, _defineProperty2.default)(_classNames10, "".concat(selectPrefixCls, "-placeholder"), placeholder && !mulOptions.length), _classNames10));
+    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));
     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));
     var TagStyle = {
       margin: '2px 8px 2px 0',
@@ -678,7 +691,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: "".concat(selectPrefixCls, "-suffix")
     }, renderSuffix()));
   };
-  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"), autoFocus && !disabled || optionShow), _classNames12));
+  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));
   var renderSelect = function renderSelect() {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: selectCls,

package/lib/tree/utils/treeUtils.js

@@ -53,6 +53,7 @@ var flattenAll = function flattenAll(treeData) {
     var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
     treeData && treeData.forEach(function (item, index) {
       var _context, _context2;
+      var _a;
       var children = item.children,
         title = item.title,
         key = item.key,
@@ -66,7 +67,7 @@ var flattenAll = function flattenAll(treeData) {
         hasChildNode: hasChildNode,
         children: children,
         level: level,
-        parentKey: (parent === null || parent === void 0 ? void 0 : parent.key) || null,
+        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,
         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]) : []
       }, others);
       keysData[key] = flattenNode;
@@ -147,11 +148,8 @@ var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData)
   filterKeys.forEach(function (item) {
     var node = (0, _extends2.default)({}, item);
     while (node) {
-      var _context3;
       allFilterKeys.add(node.key);
-      !(0, _includes.default)(_context3 = (0, _map.default)(filterKeys).call(filterKeys, function (i) {
-        return i.key;
-      })).call(_context3, node.key) && filterExpandKeys.add(node.key);
+      filterExpandKeys.add(node.key);
       node = (keysData === null || keysData === void 0 ? void 0 : keysData[node === null || node === void 0 ? void 0 : node.parentKey]) || null;
     }
   });
@@ -298,10 +296,10 @@ var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
 };
 exports.getSpreadAttrData = getSpreadAttrData;
 var addKeys = function addKeys() {
-  var _context4;
+  var _context3;
   var prevKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var newKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return (0, _from.default)(new _set.default((0, _concat.default)(_context4 = []).call(_context4, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
+  return (0, _from.default)(new _set.default((0, _concat.default)(_context3 = []).call(_context3, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
 };
 exports.addKeys = addKeys;
 var getAllParentKeys = function getAllParentKeys(data) {
@@ -352,13 +350,13 @@ var getPos = function getPos(data, key) {
 };
 exports.getPos = getPos;
 var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
-  var _context5;
+  var _context4;
   var checkedKeys = [];
   keys.forEach(function (item) {
     var pos = getPos(data, item);
     checkedKeys.push.apply(checkedKeys, (0, _toConsumableArray2.default)(getAllChildKeys(data, pos)));
   });
-  return (0, _from.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, checkedKeys, (0, _toConsumableArray2.default)(keys))));
+  return (0, _from.default)(new _set.default((0, _concat.default)(_context4 = []).call(_context4, checkedKeys, (0, _toConsumableArray2.default)(keys))));
 };
 exports.getInitCheckedKeys = getInitCheckedKeys;
 var getInitCheckededState = function getInitCheckededState(data) {
@@ -454,7 +452,7 @@ var updateParent = function updateParent(key, keysNodeProps, allKeys, halfChecke
   });
 };
 var getInitCheckededKeys = function getInitCheckededKeys() {
-  var _context6;
+  var _context5;
   var checkedKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var keysNodeProps = arguments.length > 1 ? arguments[1] : undefined;
   var checkedKeysSet = new _set.default(checkedKeys || []);
@@ -474,7 +472,7 @@ var getInitCheckededKeys = function getInitCheckededKeys() {
     }
   });
   return {
-    checkedKeys: (0, _toConsumableArray2.default)(new _set.default((0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(checkedKeysSet), (0, _toConsumableArray2.default)(childCheckedKeysSet)))),
+    checkedKeys: (0, _toConsumableArray2.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, (0, _toConsumableArray2.default)(checkedKeysSet), (0, _toConsumableArray2.default)(childCheckedKeysSet)))),
     halfCheckedKeys: (0, _toConsumableArray2.default)(halfCheckedKeysSet)
   };
 };
@@ -642,8 +640,8 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
     }
   }
   if (isSearching) {
-    var _context7;
-    keys = (0, _concat.default)(_context7 = []).call(_context7, (0, _toConsumableArray2.default)(searchExpandedKeys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
+    var _context6;
+    keys = (0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(searchExpandedKeys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
   }
   return (0, _from.default)(new _set.default((0, _toConsumableArray2.default)(keys)));
 };

package/lib/upload/upload.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { UploadProps } from './interface';
 declare const Upload: React.ForwardRefExoticComponent<UploadProps<any> & React.RefAttributes<unknown>>;
 export default Upload;