@kdcloudjs/kdesign 1.6.38 → 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/date-picker/date-panel.js

@@ -22,7 +22,10 @@ function Panel(props) {
     locale = context.locale,
     innerPicker = context.innerPicker,
     setInnerPicker = context.setInnerPicker;
-  var isInInnerPicker = innerPicker !== undefined;
+  var isInnerPicker = innerPicker !== undefined;
+  var isPositionLeft = panelPosition === 'left';
+  var isPositionRight = panelPosition === 'right';
+  var isPositionUnset = typeof panelPosition === 'undefined';
   var _props$picker = props.picker,
     picker = _props$picker === void 0 ? 'date' : _props$picker,
     format = props.format,
@@ -51,7 +54,7 @@ function Panel(props) {
     return /*#__PURE__*/React.createElement(Quarter, _extends({}, props));
   };
   var renderDatePanel = function renderDatePanel() {
-    if (isInInnerPicker) {
+    if (isInnerPicker) {
       if (innerPicker === 'year') {
         return renderYearPanel();
       } else {
@@ -192,8 +195,8 @@ function Panel(props) {
         panel = renderYearPanel();
         headerObj = renderYearHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
@@ -202,8 +205,8 @@ function Panel(props) {
         panel = renderMonthPanel();
         headerObj = renderMonthHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
@@ -212,19 +215,20 @@ function Panel(props) {
         panel = renderQuarterPanel();
         headerObj = renderMonthHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
+    // 时间面板，4个箭头的显隐，在时间范围时需要判断是否在快捷选择面板下
     case 'date':
       {
         headerObj = renderDateHeader();
         headerProps = {
-          onPrev: panelPosition === 'right' || isInInnerPicker ? undefined : onPrev,
-          onNext: panelPosition === 'left' || isInInnerPicker ? undefined : onNext,
-          onSuperPrev: panelPosition === 'right' || innerPicker === 'month' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' || innerPicker === 'month' ? undefined : onSuperNext
+          onPrev: isPositionLeft && !isInnerPicker || innerPicker === 'month' || isPositionUnset ? onPrev : undefined,
+          onNext: isPositionRight && !isInnerPicker || innerPicker === 'month' || isPositionUnset ? onNext : undefined,
+          onSuperPrev: isPositionLeft && !isInnerPicker || innerPicker === 'year' || isPositionUnset ? onSuperPrev : undefined,
+          onSuperNext: isPositionRight && !isInnerPicker || innerPicker === 'year' || isPositionUnset ? onSuperNext : undefined
         };
         panel = renderDatePanel();
         break;
@@ -234,10 +238,10 @@ function Panel(props) {
         panel = renderDatePanel();
         headerObj = renderDateHeader();
         headerProps = {
-          onPrev: panelPosition === 'right' ? undefined : onPrev,
-          onNext: panelPosition === 'left' ? undefined : onNext,
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onPrev: isPositionRight ? undefined : onPrev,
+          onNext: isPositionLeft ? undefined : onNext,
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }

package/es/date-picker/range-picker.d.ts

@@ -1,11 +1,11 @@
-import React from 'react';
+import React, { ReactNode, Ref, FocusEventHandler, CSSProperties } from 'react';
 import { DateType, RangeValue, EventValue, DisabledTimes, PanelMode, SharedTimeProps } from './interface';
 import { PickerBaseProps, PickerDateProps, PickerTimeProps } from './date-picker';
 export declare type RangeType = 'start' | 'end';
 export interface RangeInfo {
     range: RangeType;
 }
-export declare type RangeDateRender = (currentDate: DateType, today: DateType, info: RangeInfo) => React.ReactNode;
+export declare type RangeDateRender = (currentDate: DateType, today: DateType, info: RangeInfo) => ReactNode;
 export interface RangePickerSharedProps {
     id?: string;
     value?: RangeValue;
@@ -15,23 +15,23 @@ export interface RangePickerSharedProps {
     disabled?: boolean | [boolean, boolean];
     disabledTimePanel?: (date: EventValue, type: RangeType) => DisabledTimes;
     ranges?: Record<string, DateType[] | (() => DateType[])>;
-    separator?: React.ReactNode;
+    separator?: ReactNode;
     allowEmpty?: [boolean, boolean];
-    suffixIcon?: React.ReactNode;
-    clearIcon?: React.ReactNode;
+    suffixIcon?: ReactNode;
+    clearIcon?: ReactNode;
     mode?: [PanelMode, PanelMode];
     onChange?: (values: RangeValue, formatString: [string | null, string | null]) => void;
     onCalendarChange?: (values: RangeValue, formatString: [string | null, string | null], info: RangeInfo) => void;
     onPanelChange?: (values: RangeValue, modes: [PanelMode, PanelMode]) => void;
-    onFocus?: React.FocusEventHandler<HTMLInputElement>;
-    onBlur?: React.FocusEventHandler<HTMLInputElement>;
+    onFocus?: FocusEventHandler<HTMLInputElement>;
+    onBlur?: FocusEventHandler<HTMLInputElement>;
     onOk?: (dates: RangeValue) => void;
     activePickerIndex?: 0 | 1;
     dateRender?: RangeDateRender;
-    panelRender?: (originPanel: React.ReactNode) => React.ReactNode;
+    panelRender?: (originPanel: ReactNode) => ReactNode;
     getPopupContainer?: (node: HTMLElement) => HTMLElement;
-    popupRef?: React.Ref<any>;
-    popupStyle?: React.CSSProperties;
+    popupRef?: Ref<any>;
+    popupStyle?: CSSProperties;
     dropdownClassName?: string;
 }
 declare type OmitPickerProps<Props> = Omit<Props, 'value' | 'defaultValue' | 'defaultPickerValue' | 'placeholder' | 'disabled' | 'disabledTimePanel' | 'showToday' | 'showTime' | 'mode' | 'onChange' | 'onSelect' | 'onPanelChange' | 'pickerValue' | 'onPickerValueChange' | 'onOk' | 'dateRender'>;

package/es/date-picker/range-picker.js

@@ -4,10 +4,10 @@ import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState, useRef, useMemo, forwardRef } from 'react';
 import isSameWeek from 'date-fns/isSameWeek';
 import ConfigContext from '../config-provider/ConfigContext';
-import { useMergedState, useOnClickOutside } from '../_utils/hooks';
+import { useMergedState } from '../_utils/hooks';
 import { getCompProps } from '../_utils';
 import Context from './context';
 import Panel from './date-panel';
@@ -115,16 +115,18 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     componentName: 'DatePicker'
   }), locale || {});
   // ref
-  var panelDivRef = React.useRef(null);
-  var inputDivRef = ref || /*#__PURE__*/React.createRef();
-  var startInputDivRef = React.useRef(null);
-  var endInputDivRef = React.useRef(null);
-  var separatorRef = React.useRef(null);
-  var startInputRef = React.useRef(null);
-  var endInputRef = React.useRef(null);
-  var popperRef = popupRef || /*#__PURE__*/React.createRef();
-  var openRecordsRef = React.useRef({});
-  var mergedDisabled = React.useMemo(function () {
+  var panelDivRef = useRef(null);
+  var defaultRef = useRef(null);
+  var inputDivRef = ref || defaultRef;
+  var startInputDivRef = useRef(null);
+  var endInputDivRef = useRef(null);
+  var separatorRef = useRef(null);
+  var startInputRef = useRef(null);
+  var endInputRef = useRef(null);
+  var defaultPopupRef = useRef(null);
+  var popperRef = popupRef || defaultPopupRef;
+  var openRecordsRef = useRef({});
+  var mergedDisabled = useMemo(function () {
     if (Array.isArray(disabled)) {
       return disabled;
     }
@@ -268,10 +270,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     endText = _useTextValueMapping4[0],
     triggerEndTextChange = _useTextValueMapping4[1],
     resetEndText = _useTextValueMapping4[2];
-  var _React$useState = React.useState([null, null]),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    hoverRangedValue = _React$useState2[0],
-    setHoverRangedValue = _React$useState2[1];
+  var _useState = useState([null, null]),
+    _useState2 = _slicedToArray(_useState, 2),
+    hoverRangedValue = _useState2[0],
+    setHoverRangedValue = _useState2[1];
   var _useHoverValue = useHoverValue(startText, {
       format: _format
     }),
@@ -309,20 +311,13 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     _useMergedState10 = _slicedToArray(_useMergedState9, 2),
     mergedModes = _useMergedState10[0],
     setInnerModes = _useMergedState10[1];
-  var _useState = useState(undefined),
-    _useState2 = _slicedToArray(_useState, 2),
-    innerPicker = _useState2[0],
-    setInnerPicker = _useState2[1];
+  var _useState3 = useState(undefined),
+    _useState4 = _slicedToArray(_useState3, 2),
+    innerPicker = _useState4[0],
+    setInnerPicker = _useState4[1];
   useEffect(function () {
     setInnerModes([picker, picker]);
   }, [picker]);
-  // const triggerModesChange = (modes: [PanelMode, PanelMode], values: RangeValue) => {
-  //   setInnerModes(modes)
-  //   if (onPanelChange) {
-  //     onPanelChange(values, modes)
-  //   }
-  // }
-  // ========================= Disable Date ==========================
   var _useRangeDisabled = useRangeDisabled({
       picker: picker,
       selectedValue: selectedValue,
@@ -332,11 +327,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     _useRangeDisabled2 = _slicedToArray(_useRangeDisabled, 2),
     disabledStartDate = _useRangeDisabled2[0],
     disabledEndDate = _useRangeDisabled2[1];
-  // const onResetText = () => {
-  //   resetEndText()
-  //   resetStartText()
-  // }
-  var triggerRef = React.useRef();
+  var triggerRef = useRef();
   var triggerOpen = function triggerOpen(newOpen, index) {
     if (newOpen) {
       clearTimeout(triggerRef.current);
@@ -415,22 +406,28 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       triggerOpen(false, sourceIndex);
     }
   };
-  useOnClickOutside([popperRef, inputDivRef], function () {
-    setViewDate(null, 0);
-    setViewDate(null, 1);
-    setHoverRangedValue([null, null]);
-  });
+  // useOnClickOutside([popperRef, inputDivRef], () => {
+  //   setViewDate(null, 0)
+  //   setViewDate(null, 1)
+  //   setHoverRangedValue([null, null])
+  // })
   var onSelect = function onSelect(date, type) {
     var values = updateValues(selectedValue, date, mergedActivePickerIndex);
-    if (type === 'submit' || type !== 'key' && !needConfirmButton) {
-      triggerChange(values, mergedActivePickerIndex);
-      if (mergedActivePickerIndex === 0) {
-        onStartLeave();
-      } else {
-        onEndLeave();
+    if (type === 'inner') {
+      if (values && values[mergedActivePickerIndex]) {
+        setViewDate(values[mergedActivePickerIndex], mergedActivePickerIndex);
       }
     } else {
-      setSelectedValue(values);
+      if (type === 'submit' || type !== 'key' && !needConfirmButton) {
+        triggerChange(values, mergedActivePickerIndex);
+        if (mergedActivePickerIndex === 0) {
+          onStartLeave();
+        } else {
+          onEndLeave();
+        }
+      } else {
+        setSelectedValue(values);
+      }
     }
   };
   var onDateMouseEnter = function onDateMouseEnter(date) {
@@ -460,6 +457,11 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       if (!endValueTexts.length || endValueTexts[0] === '') {
         triggerEndTextChange('');
       }
+      setViewDate(null, 0);
+      setViewDate(null, 1);
+      setHoverRangedValue([null, null]);
+    } else {
+      setInnerPicker(undefined);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mergedOpen, startValueTexts, endValueTexts]);
@@ -539,7 +541,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       }, renderPanel());
       panels = /*#__PURE__*/React.createElement("div", {
         className: classNames("".concat(datePickerPrefixCls, "-container-date"))
-      }, leftPanel, rightPanel);
+      }, leftPanel, innerPicker === undefined ? rightPanel : null);
     } else {
       panels = /*#__PURE__*/React.createElement(Context.Provider, {
         value: {
@@ -694,6 +696,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     getPopupContainer: getPopupContainer
   });
 };
-var RangePicker = /*#__PURE__*/React.forwardRef(InternalRangePicker);
+var RangePicker = /*#__PURE__*/forwardRef(InternalRangePicker);
 RangePicker.displayName = 'RangePicker';
 export default RangePicker;

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/date-picker/date-panel.js

@@ -34,7 +34,10 @@ function Panel(props) {
     locale = context.locale,
     innerPicker = context.innerPicker,
     setInnerPicker = context.setInnerPicker;
-  var isInInnerPicker = innerPicker !== undefined;
+  var isInnerPicker = innerPicker !== undefined;
+  var isPositionLeft = panelPosition === 'left';
+  var isPositionRight = panelPosition === 'right';
+  var isPositionUnset = typeof panelPosition === 'undefined';
   var _props$picker = props.picker,
     picker = _props$picker === void 0 ? 'date' : _props$picker,
     format = props.format,
@@ -63,7 +66,7 @@ function Panel(props) {
     return /*#__PURE__*/_react.default.createElement(_quarter.default, (0, _extends2.default)({}, props));
   };
   var renderDatePanel = function renderDatePanel() {
-    if (isInInnerPicker) {
+    if (isInnerPicker) {
       if (innerPicker === 'year') {
         return renderYearPanel();
       } else {
@@ -204,8 +207,8 @@ function Panel(props) {
         panel = renderYearPanel();
         headerObj = renderYearHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
@@ -214,8 +217,8 @@ function Panel(props) {
         panel = renderMonthPanel();
         headerObj = renderMonthHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
@@ -224,19 +227,20 @@ function Panel(props) {
         panel = renderQuarterPanel();
         headerObj = renderMonthHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
+    // 时间面板，4个箭头的显隐，在时间范围时需要判断是否在快捷选择面板下
     case 'date':
       {
         headerObj = renderDateHeader();
         headerProps = {
-          onPrev: panelPosition === 'right' || isInInnerPicker ? undefined : onPrev,
-          onNext: panelPosition === 'left' || isInInnerPicker ? undefined : onNext,
-          onSuperPrev: panelPosition === 'right' || innerPicker === 'month' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' || innerPicker === 'month' ? undefined : onSuperNext
+          onPrev: isPositionLeft && !isInnerPicker || innerPicker === 'month' || isPositionUnset ? onPrev : undefined,
+          onNext: isPositionRight && !isInnerPicker || innerPicker === 'month' || isPositionUnset ? onNext : undefined,
+          onSuperPrev: isPositionLeft && !isInnerPicker || innerPicker === 'year' || isPositionUnset ? onSuperPrev : undefined,
+          onSuperNext: isPositionRight && !isInnerPicker || innerPicker === 'year' || isPositionUnset ? onSuperNext : undefined
         };
         panel = renderDatePanel();
         break;
@@ -246,10 +250,10 @@ function Panel(props) {
         panel = renderDatePanel();
         headerObj = renderDateHeader();
         headerProps = {
-          onPrev: panelPosition === 'right' ? undefined : onPrev,
-          onNext: panelPosition === 'left' ? undefined : onNext,
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onPrev: isPositionRight ? undefined : onPrev,
+          onNext: isPositionLeft ? undefined : onNext,
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }