@kdcloudjs/kdesign 1.6.38 → 1.6.39

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/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;
       }

package/lib/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/lib/date-picker/range-picker.js

@@ -127,16 +127,18 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     componentName: 'DatePicker'
   }), locale || {});
   // ref
-  var panelDivRef = _react.default.useRef(null);
-  var inputDivRef = ref || /*#__PURE__*/_react.default.createRef();
-  var startInputDivRef = _react.default.useRef(null);
-  var endInputDivRef = _react.default.useRef(null);
-  var separatorRef = _react.default.useRef(null);
-  var startInputRef = _react.default.useRef(null);
-  var endInputRef = _react.default.useRef(null);
-  var popperRef = popupRef || /*#__PURE__*/_react.default.createRef();
-  var openRecordsRef = _react.default.useRef({});
-  var mergedDisabled = _react.default.useMemo(function () {
+  var panelDivRef = (0, _react.useRef)(null);
+  var defaultRef = (0, _react.useRef)(null);
+  var inputDivRef = ref || defaultRef;
+  var startInputDivRef = (0, _react.useRef)(null);
+  var endInputDivRef = (0, _react.useRef)(null);
+  var separatorRef = (0, _react.useRef)(null);
+  var startInputRef = (0, _react.useRef)(null);
+  var endInputRef = (0, _react.useRef)(null);
+  var defaultPopupRef = (0, _react.useRef)(null);
+  var popperRef = popupRef || defaultPopupRef;
+  var openRecordsRef = (0, _react.useRef)({});
+  var mergedDisabled = (0, _react.useMemo)(function () {
     if (Array.isArray(disabled)) {
       return disabled;
     }
@@ -280,10 +282,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     endText = _useTextValueMapping4[0],
     triggerEndTextChange = _useTextValueMapping4[1],
     resetEndText = _useTextValueMapping4[2];
-  var _React$useState = _react.default.useState([null, null]),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    hoverRangedValue = _React$useState2[0],
-    setHoverRangedValue = _React$useState2[1];
+  var _useState = (0, _react.useState)([null, null]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    hoverRangedValue = _useState2[0],
+    setHoverRangedValue = _useState2[1];
   var _useHoverValue = (0, _useHoverValue5.default)(startText, {
       format: _format
     }),
@@ -321,20 +323,13 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     _useMergedState10 = (0, _slicedToArray2.default)(_useMergedState9, 2),
     mergedModes = _useMergedState10[0],
     setInnerModes = _useMergedState10[1];
-  var _useState = (0, _react.useState)(undefined),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    innerPicker = _useState2[0],
-    setInnerPicker = _useState2[1];
+  var _useState3 = (0, _react.useState)(undefined),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    innerPicker = _useState4[0],
+    setInnerPicker = _useState4[1];
   (0, _react.useEffect)(function () {
     setInnerModes([picker, picker]);
   }, [picker]);
-  // const triggerModesChange = (modes: [PanelMode, PanelMode], values: RangeValue) => {
-  //   setInnerModes(modes)
-  //   if (onPanelChange) {
-  //     onPanelChange(values, modes)
-  //   }
-  // }
-  // ========================= Disable Date ==========================
   var _useRangeDisabled = (0, _useRangeDisabled3.default)({
       picker: picker,
       selectedValue: selectedValue,
@@ -344,11 +339,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     _useRangeDisabled2 = (0, _slicedToArray2.default)(_useRangeDisabled, 2),
     disabledStartDate = _useRangeDisabled2[0],
     disabledEndDate = _useRangeDisabled2[1];
-  // const onResetText = () => {
-  //   resetEndText()
-  //   resetStartText()
-  // }
-  var triggerRef = _react.default.useRef();
+  var triggerRef = (0, _react.useRef)();
   var triggerOpen = function triggerOpen(newOpen, index) {
     if (newOpen) {
       clearTimeout(triggerRef.current);
@@ -427,22 +418,28 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       triggerOpen(false, sourceIndex);
     }
   };
-  (0, _hooks.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 = (0, _utils2.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) {
@@ -472,6 +469,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]);
@@ -551,7 +553,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       }, renderPanel());
       panels = /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)("".concat(datePickerPrefixCls, "-container-date"))
-      }, leftPanel, rightPanel);
+      }, leftPanel, innerPicker === undefined ? rightPanel : null);
     } else {
       panels = /*#__PURE__*/_react.default.createElement(_context.default.Provider, {
         value: {
@@ -706,7 +708,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     getPopupContainer: getPopupContainer
   });
 };
-var RangePicker = /*#__PURE__*/_react.default.forwardRef(InternalRangePicker);
+var RangePicker = /*#__PURE__*/(0, _react.forwardRef)(InternalRangePicker);
 RangePicker.displayName = 'RangePicker';
 var _default = RangePicker;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.6.38",
+  "version": "1.6.39",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -77,7 +77,7 @@
     "@babel/runtime": "^7.10.4",
     "@babel/runtime-corejs3": "^7.11.2",
     "@babel/standalone": "^7.14.3",
-    "@kdcloudjs/table": "canary",
+    "@kdcloudjs/table": "1.1.5-canary.3",
     "@popperjs/core": "^2.5.4",
     "async-validator": "^3.5.1",
     "axios": "^0.21.1",