@chaoswise/ui 2.3.1 → 2.3.2

package/lib/CWRangePicker/DropdownMenu/MoreTimeList/index.js

@@ -14,7 +14,6 @@ import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
 import React from "react";
 import classnames from "classnames";
 import { getLocale } from "../../locale";
-import _ from "lodash";
 import "./index.less";
 var MoreTimeList = function MoreTimeList(props) {
   var regroupDataSource = props.regroupDataSource,

package/lib/CWRangePicker/DropdownMenu/index.js

@@ -32,7 +32,6 @@ import MoreSvg from "../assets/more";
 import MoreTimeList from "./MoreTimeList";
 import MoreHistoryList from "./MoreHistoryList";
 import { judgeType, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo } from "../utils";
-import _ from "lodash";
 import "./index.less";
 var DropdownMenu = function DropdownMenu(props) {
   var dataSource = props.dataSource,
@@ -47,9 +46,7 @@ var DropdownMenu = function DropdownMenu(props) {
     setIsFocus = props.setIsFocus,
     historyList = props.historyList,
     setHistoryList = props.setHistoryList,
-    format = props.format,
-    setIsAutoRefresh = props.setIsAutoRefresh,
-    refreshOption = props.refreshOption;
+    format = props.format;
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
     locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
@@ -64,8 +61,6 @@ var DropdownMenu = function DropdownMenu(props) {
     showDefaultHistoryCount = _menuOption$showDefau2 === void 0 ? 5 : _menuOption$showDefau2,
     _menuOption$moreHisto = menuOption.moreHistoryDropdownPosition,
     moreHistoryDropdownPosition = _menuOption$moreHisto === void 0 ? "left" : _menuOption$moreHisto;
-  var _refreshOption$onAuto = refreshOption.onAutoRefreshChange,
-    onAutoRefreshChange = _refreshOption$onAuto === void 0 ? function () {} : _refreshOption$onAuto;
   // 点击Menu.Item中切换选项列表
   var onClickItem = function onClickItem(item) {
     var timeDomain = recordDateValue.timeDomain,
@@ -81,17 +76,6 @@ var DropdownMenu = function DropdownMenu(props) {
         value: funcValueChangeArrayValue(values)
       });
       returnValue = getCorrectValue(returnValue, item.key);
-      var _judgeType = judgeType(returnValue),
-        _judgeType2 = _slicedToArray(_judgeType, 1),
-        isRule = _judgeType2[0];
-      if (!isRule && !returnValue.value) {
-        setIsAutoRefresh(function (pre) {
-          if (!pre) {
-            onAutoRefreshChange(true);
-          }
-          return true;
-        });
-      }
       onChange(returnValue);
       var _getHistoryInfo = getHistoryInfo(returnValue, historyList, locale, format),
         _getHistoryInfo2 = _slicedToArray(_getHistoryInfo, 2),
@@ -123,17 +107,6 @@ var DropdownMenu = function DropdownMenu(props) {
         value: funcValueChangeArrayValue(values)
       });
       returnValue = getCorrectValue(returnValue, timeDomain);
-      var _judgeType3 = judgeType(returnValue),
-        _judgeType4 = _slicedToArray(_judgeType3, 1),
-        isRule = _judgeType4[0];
-      if (!isRule && !returnValue.value) {
-        setIsAutoRefresh(function (pre) {
-          if (!pre) {
-            onAutoRefreshChange(true);
-          }
-          return true;
-        });
-      }
       onChange(returnValue);
       if (!_value) {
         setRecordDateValue(returnValue);
@@ -158,9 +131,9 @@ var DropdownMenu = function DropdownMenu(props) {
     className: classnames("cw-dropdown-menu-wrapper")
   }, dataSource === null || dataSource === void 0 ? void 0 : dataSource.slice(0, showDefaultCount).map(function (item) {
     var values = item.value;
-    var _judgeType5 = judgeType(item),
-      _judgeType6 = _slicedToArray(_judgeType5, 1),
-      isRule = _judgeType6[0];
+    var _judgeType = judgeType(item),
+      _judgeType2 = _slicedToArray(_judgeType, 1),
+      isRule = _judgeType2[0];
     var isHasDate = true;
     if (!isRule && !values) {
       isHasDate = false;

package/lib/CWRangePicker/Refresh/index.js

@@ -12,6 +12,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /*
  * @Author: andrew.qiao andrew.qiao@cloudwise.com
  * @Date: 2022-09-05 09:23:24
@@ -25,7 +31,7 @@ import classnames from "classnames";
 import Refresh1Svg from "../assets/Refresh1";
 import Refresh2Svg from "../assets/Refresh2";
 import Refresh3Svg from "../assets/Refresh3";
-import { getUnit, getChangeUnitDate, funcValueChangeArrayValue, getTimeSpanFromValue, computedRecentlyValue } from "../utils";
+import { getChangeUnitDate, funcValueChangeArrayValue, getTimeSpanFromValue, computedRecentlyValue, judgeType } from "../utils";
 import { getLocale } from "../locale";
 import "./index.less";
 var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -37,7 +43,9 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
     setIsAutoRefresh = props.setIsAutoRefresh,
     refreshOption = props.refreshOption,
     isHasDate = props.isHasDate,
-    setBackTooltipVisible = props.setBackTooltipVisible;
+    setBackTooltipVisible = props.setBackTooltipVisible,
+    enableAutoRefresh = props.enableAutoRefresh,
+    isClickAutoRefresh = props.isClickAutoRefresh;
   var _refreshOption$onAuto = refreshOption.onAutoRefreshChange,
     onAutoRefreshChange = _refreshOption$onAuto === void 0 ? function () {} : _refreshOption$onAuto,
     _refreshOption$onClic = refreshOption.onClickRefresh,
@@ -56,14 +64,14 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
   var localeObj = getLocale(locale);
   // 手动刷新
   var onRefresh = function onRefresh() {
-    var values = recordDateValue.value,
-      key = recordDateValue.key;
-    var _getUnit = getUnit(key),
-      isRule = _getUnit.isRule,
-      captureUnit = _getUnit.captureUnit;
+    var values = recordDateValue.value;
+    var _judgeType = judgeType(recordDateValue),
+      _judgeType2 = _slicedToArray(_judgeType, 2),
+      isRule = _judgeType2[0],
+      captureUnit = _judgeType2[1];
     var returnValue = _objectSpread({}, recordDateValue);
     values = funcValueChangeArrayValue(values);
-    if (isAutoRefresh) {
+    if (enableAutoRefresh) {
       if (values) {
         returnValue = _objectSpread(_objectSpread({}, returnValue), {}, {
           value: computedRecentlyValue(values)
@@ -81,24 +89,32 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
   var onAutoRefresh = function onAutoRefresh() {
     setBackTooltipVisible(false);
     onClickAutoRefresh(!isAutoRefresh);
+    isClickAutoRefresh.current = true;
     if (isHasDate) {
       var values = recordDateValue.value,
         key = recordDateValue.key,
         rest = _objectWithoutProperties(recordDateValue, _excluded);
-      var _getUnit2 = getUnit(key),
-        isRule = _getUnit2.isRule,
-        captureUnit = _getUnit2.captureUnit;
+      var _judgeType3 = judgeType(recordDateValue),
+        _judgeType4 = _slicedToArray(_judgeType3, 2),
+        isRule = _judgeType4[0],
+        captureUnit = _judgeType4[1];
       values = funcValueChangeArrayValue(values);
       var finalRecordDateValue = {
         isRecently: false
       };
-      if (!isAutoRefresh) {
+      if (!enableAutoRefresh) {
         if (values) {
           values = computedRecentlyValue(values);
           finalRecordDateValue = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, finalRecordDateValue), rest), getTimeSpanFromValue(values)), {}, {
             isRecently: true
           });
         }
+        if (isRule) {
+          values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
+          finalRecordDateValue = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, finalRecordDateValue), rest), getTimeSpanFromValue(values)), {}, {
+            isRecently: true
+          });
+        }
       } else {
         if (values) {
           finalRecordDateValue = _objectSpread(_objectSpread({}, finalRecordDateValue), {}, {
@@ -116,11 +132,11 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
         setRecordDateValue(finalRecordDateValue);
       }
     } else {
-      onChange(recordDateValue);
+      onAutoRefreshChange(!enableAutoRefresh);
       setIsAutoRefresh(function (pre) {
-        onAutoRefreshChange(!pre);
         return !pre;
       });
+      onChange(recordDateValue);
       if (!value) {
         setRecordDateValue(recordDateValue);
       }
@@ -145,9 +161,9 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
     onClick: onAutoRefresh,
     disabled: isDisabledAutoRefresh,
     className: classnames({
-      "cw-range-picker-auto-refresh-wrapper": isAutoRefresh
+      "cw-range-picker-auto-refresh-wrapper": enableAutoRefresh
     })
-  }, isAutoRefresh ? /*#__PURE__*/React.createElement(Refresh3Svg, {
+  }, enableAutoRefresh ? /*#__PURE__*/React.createElement(Refresh3Svg, {
     className: "cw-range-picker-auto-refresh"
   }) : /*#__PURE__*/React.createElement(Refresh2Svg, null))));
 });

package/lib/CWRangePicker/TimeSpan/index.js

@@ -25,20 +25,17 @@ var TimeSpan = function TimeSpan(props) {
     onRecover = props.onRecover,
     timeSpanOption = props.timeSpanOption,
     isAutoRefresh = props.isAutoRefresh,
-    setIsAutoRefresh = props.setIsAutoRefresh,
-    refreshOption = props.refreshOption,
     forwardTooltipVisible = props.forwardTooltipVisible,
     setForwardTooltipVisible = props.setForwardTooltipVisible,
     backTooltipVisible = props.backTooltipVisible,
     setBackTooltipVisible = props.setBackTooltipVisible,
     expandTooltipVisible = props.expandTooltipVisible,
-    setExpandTooltipVisible = props.setExpandTooltipVisible;
+    setExpandTooltipVisible = props.setExpandTooltipVisible,
+    isRightDisabled = props.isRightDisabled;
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
     locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
   var localeObj = getLocale(locale);
-  var _refreshOption$onAuto = refreshOption.onAutoRefreshChange,
-    onAutoRefreshChange = _refreshOption$onAuto === void 0 ? function () {} : _refreshOption$onAuto;
   var _timeSpanOption$showF = timeSpanOption.showForwardBtn,
     showForwardBtn = _timeSpanOption$showF === void 0 ? true : _timeSpanOption$showF,
     _timeSpanOption$showB = timeSpanOption.showBackwardBtn,
@@ -46,7 +43,10 @@ var TimeSpan = function TimeSpan(props) {
     _timeSpanOption$showE = timeSpanOption.showEnlargeBtn,
     showEnlargeBtn = _timeSpanOption$showE === void 0 ? true : _timeSpanOption$showE,
     _timeSpanOption$toolt = timeSpanOption.tooltipTitleCustom,
-    tooltipTitleCustom = _timeSpanOption$toolt === void 0 ? {} : _timeSpanOption$toolt;
+    tooltipTitleCustom = _timeSpanOption$toolt === void 0 ? {} : _timeSpanOption$toolt,
+    forwardIcon = timeSpanOption.forwardIcon,
+    backIcon = timeSpanOption.backIcon,
+    expandIcon = timeSpanOption.expandIcon;
   var _tooltipTitleCustom$f = tooltipTitleCustom.forwardTitle,
     forwardTitle = _tooltipTitleCustom$f === void 0 ? localeObj["forwardSmooth"] : _tooltipTitleCustom$f,
     _tooltipTitleCustom$b = tooltipTitleCustom.backTitle,
@@ -77,7 +77,7 @@ var TimeSpan = function TimeSpan(props) {
     },
     visible: forwardTooltipVisible
   }, showForwardBtn && /*#__PURE__*/React.createElement(_Button, {
-    icon: "caret-left",
+    icon: forwardIcon ? forwardIcon : "caret-left",
     onClick: function onClick() {
       onChangeTimeSpan("left");
     },
@@ -87,16 +87,16 @@ var TimeSpan = function TimeSpan(props) {
     }
   })), /*#__PURE__*/React.createElement(_Tooltip, {
     title: backTitle,
-    visible: isAutoRefresh ? false : backTooltipVisible,
+    visible: isRightDisabled ? false : backTooltipVisible,
     onVisibleChange: function onVisibleChange(visible) {
       setBackTooltipVisible(visible);
     }
   }, showBackwardBtn && /*#__PURE__*/React.createElement(_Button, {
-    icon: "caret-right",
+    icon: backIcon ? backIcon : "caret-right",
     onClick: function onClick() {
       onChangeTimeSpan("right");
     },
-    disabled: isAutoRefresh
+    disabled: isRightDisabled
   })), showEnlargeBtn && /*#__PURE__*/React.createElement(_Tooltip, {
     title: expandTitle,
     onVisibleChange: function onVisibleChange(visible) {
@@ -104,7 +104,7 @@ var TimeSpan = function TimeSpan(props) {
     },
     visible: expandTooltipVisible
   }, /*#__PURE__*/React.createElement(_Button, {
-    icon: "zoom-out",
+    icon: expandIcon ? expandIcon : "zoom-out",
     onClick: function onClick() {
       onChangeTimeSpan("even");
     },

package/lib/CWRangePicker/index.js

@@ -41,10 +41,10 @@ import Refresh from "./Refresh";
 import CalendarSvg from "./assets/Calendar";
 import LiveSvg from "./assets/live";
 import RecoverSvg from "./assets/Recover";
-import { regroupDataSourceFn, echoInputValue, getUnit, judgeType, getChangeUnitDate, isInvalidDate, range, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo, getFinalDateOption, getTruthDateCount, isAfterDate } from "./utils";
+import { regroupDataSourceFn, echoInputValue, getUnit, judgeType, getChangeUnitDate, isInvalidDate, range, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo, getFinalDateOption, getTruthDateCount, isAfterDate, isSameDate } from "./utils";
+import _ from "lodash";
 import moment from "moment";
 import "./index.less";
-// const { RangePicker } = DatePicker;
 var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue,
     value = props.value,
@@ -53,6 +53,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     classNameWrapper = props.classNameWrapper,
     _props$onChange = props.onChange,
     _onChange = _props$onChange === void 0 ? function () {} : _props$onChange,
+    _props$onInitChange = props.onInitChange,
+    _onInitChange = _props$onInitChange === void 0 ? function () {} : _props$onInitChange,
     _props$growSize = props.growSize,
     growSize = _props$growSize === void 0 ? 3 : _props$growSize,
     _props$tipTooltipOpti = props.tipTooltipOption,
@@ -68,8 +70,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     inputPrefixIcon = props.inputPrefixIcon,
     _props$format = props.format,
     format = _props$format === void 0 ? "YYYY/MM/DD HH:mm:ss" : _props$format,
-    _props$forceRenderTit = props.forceRenderTitle,
-    forceRenderTitle = _props$forceRenderTit === void 0 ? false : _props$forceRenderTit,
+    forceRenderTitle = props.forceRenderTitle,
     open = props.open;
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
@@ -81,8 +82,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     onAutoRefreshChange = _refreshOption$onAuto2 === void 0 ? function () {} : _refreshOption$onAuto2,
     _refreshOption$delay = refreshOption.delay,
     delay = _refreshOption$delay === void 0 ? 5000 : _refreshOption$delay,
-    _refreshOption$openAu = refreshOption.openAutoRefresh,
-    openAutoRefresh = _refreshOption$openAu === void 0 ? true : _refreshOption$openAu;
+    openAutoRefresh = refreshOption.openAutoRefresh;
   var _menuOption$showCalen = menuOption.showCalendar,
     showCalendar = _menuOption$showCalen === void 0 ? true : _menuOption$showCalen,
     _menuOption$exceedSho = menuOption.exceedShowInMore,
@@ -151,6 +151,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   // 定时器计数
   var timeRef = useRef(null);
   var isInputRef = useRef(false); // 标记，输入框非默认值，输入内容
+  var isClickAutoRefresh = useRef(false); // 标记 点击自动刷新按钮
   // 输入框处理聚焦失焦
   var inputRef = useRef(null);
   // 含有刷新组件暴露的方法
@@ -177,11 +178,27 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     var _dateValue = dateValue,
       values = _dateValue.value;
     var _judgeType = judgeType(dateValue),
-      _judgeType2 = _slicedToArray(_judgeType, 1),
-      isRule = _judgeType2[0];
+      _judgeType2 = _slicedToArray(_judgeType, 2),
+      isRule = _judgeType2[0],
+      captureUnit = _judgeType2[1];
     if (!isRule && !values) {
       setIsAutoRefresh(true);
     }
+    var initValue = dateValue;
+    if (isRule) {
+      initValue = _objectSpread(_objectSpread({}, initValue), {}, {
+        isRecently: true,
+        value: getChangeUnitDate(captureUnit[0], captureUnit[1]),
+        number: captureUnit[0],
+        unit: captureUnit[1] === "mo" ? "M" : captureUnit[1]
+      });
+    } else if (values) {
+      initValue = _objectSpread(_objectSpread({}, initValue), {}, {
+        isRecently: false,
+        value: funcValueChangeArrayValue(values)
+      });
+    }
+    _onInitChange(initValue);
     setDateValue(dateValue);
   }, []);
   useEffect(function () {
@@ -191,31 +208,52 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       setRecordDateValue(defaultValue);
     }
   }, [defaultValue, value]);
+  var enableAutoRefresh = useMemo(function () {
+    return openAutoRefresh !== undefined ? openAutoRefresh : isAutoRefresh;
+  }, [openAutoRefresh, isAutoRefresh]);
   // 输入框回显
   useEffect(function () {
-    setInputValue(echoInputValue(recordDateValue, isFocus, locale, format, forceRenderTitle, isAutoRefresh));
-  }, [recordDateValue, isFocus, locale, format, forceRenderTitle, isAutoRefresh]);
+    setInputValue(echoInputValue(recordDateValue, isFocus, locale, format, forceRenderTitle, enableAutoRefresh));
+  }, [recordDateValue, isFocus, locale, format, forceRenderTitle, enableAutoRefresh]);
   useEffect(function () {
     var _judgeType3 = judgeType(recordDateValue),
       _judgeType4 = _slicedToArray(_judgeType3, 1),
       isRule = _judgeType4[0];
     var isHasDate = !isRule && !recordDateValue.value ? false : true;
     if (isHasDate) {
-      setIsAutoRefresh(function (pre) {
-        if (recordDateValue.isRecently || isRule) {
-          if (!pre) {
+      if (openAutoRefresh !== undefined) {
+        if (!isRule) {
+          if (openAutoRefresh) {
+            onAutoRefreshChange(false);
+          }
+        } else {
+          if (isRule && isClickAutoRefresh.current) {
+            onAutoRefreshChange(true);
+          }
+        }
+        isClickAutoRefresh.current = false;
+      } else {
+        if (isRule) {
+          if (!isAutoRefresh) {
             onAutoRefreshChange(true);
           }
-          return true;
         } else {
-          if (pre) {
+          if (isAutoRefresh) {
             onAutoRefreshChange(false);
           }
+        }
+      }
+      setIsAutoRefresh(function (pre) {
+        if (isRule) {
+          return true;
+        } else {
           return false;
         }
       });
+    } else {
+      isClickAutoRefresh.current = false;
     }
-  }, [recordDateValue]);
+  }, [recordDateValue, isAutoRefresh, openAutoRefresh]);
   useEffect(function () {
     var values = recordDateValue.value;
     var _judgeType5 = judgeType(recordDateValue),
@@ -223,19 +261,19 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       isRule = _judgeType6[0],
       captureUnit = _judgeType6[1],
       recordUnit = _judgeType6[2];
-    if (isAutoRefresh && isRule && openAutoRefresh) {
+    if (enableAutoRefresh && isRule) {
       timeRef.current = setInterval(function () {
         var newValue = _objectSpread(_objectSpread({}, recordDateValue), {}, {
           timeDomain: recordUnit,
           number: captureUnit[0],
-          unit: captureUnit[1],
+          unit: captureUnit[1] === "mo" ? "M" : captureUnit[1],
           value: getChangeUnitDate(captureUnit[0], captureUnit[1]),
           isRecently: true
         });
         onAutoRefresh(newValue);
       }, delay);
     }
-    if (isAutoRefresh && !isRule && !values && openAutoRefresh) {
+    if (enableAutoRefresh && !isRule && !values) {
       timeRef.current = setInterval(function () {
         onAutoRefresh(recordDateValue);
       }, delay);
@@ -243,7 +281,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     return function () {
       clearInterval(timeRef.current);
     };
-  }, [isAutoRefresh, recordDateValue, delay, openAutoRefresh]);
+  }, [enableAutoRefresh, recordDateValue, delay]);
   // 点击空白处日历切换
   useEffect(function () {
     document.addEventListener("click", clickBody);
@@ -260,15 +298,21 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         isRule = _judgeType8[0],
         captureUnit = _judgeType8[1];
       values = funcValueChangeArrayValue(values);
+      var isHasDate = true;
+      var isRightDisabled = false;
       if (isRule) {
+        isRightDisabled = true;
         values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
       }
-      if (!isRule && !values) return [false, undefined];
-      return [true, values];
+      if (!isRule && !values) {
+        isHasDate = false;
+      }
+      return [isHasDate, values, isRightDisabled];
     }, [recordDateValue]),
-    _useMemo2 = _slicedToArray(_useMemo, 2),
+    _useMemo2 = _slicedToArray(_useMemo, 3),
     isHasDate = _useMemo2[0],
-    _defaultValue = _useMemo2[1];
+    _defaultValue = _useMemo2[1],
+    isRightDisabled = _useMemo2[2];
   // 重组数据源
   var regroupDataSource = useMemo(function () {
     if (exceedShowInMore) {
@@ -299,17 +343,6 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       value: funcValueChangeArrayValue(values)
     });
     returnValue = getCorrectValue(returnValue, key);
-    var _judgeType9 = judgeType(returnValue),
-      _judgeType10 = _slicedToArray(_judgeType9, 1),
-      isRule = _judgeType10[0];
-    if (!isRule && !returnValue.value) {
-      setIsAutoRefresh(function (pre) {
-        if (!pre) {
-          onAutoRefreshChange(true);
-        }
-        return true;
-      });
-    }
     _onChange(returnValue);
     if (!value) {
       setRecordDateValue(returnValue);
@@ -441,7 +474,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     value: value,
     isAutoRefresh: isAutoRefresh,
     setIsAutoRefresh: setIsAutoRefresh,
-    refreshOption: refreshOption
+    refreshOption: refreshOption,
+    enableAutoRefresh: enableAutoRefresh
   };
   var dropdownMenuProps = _objectSpread(_objectSpread({}, commonProps), {}, {
     dataSource: dataSource,
@@ -465,11 +499,13 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     backTooltipVisible: backTooltipVisible,
     setBackTooltipVisible: setBackTooltipVisible,
     expandTooltipVisible: expandTooltipVisible,
-    setExpandTooltipVisible: setExpandTooltipVisible
+    setExpandTooltipVisible: setExpandTooltipVisible,
+    isRightDisabled: isRightDisabled
   });
   var refreshProps = _objectSpread(_objectSpread({}, commonProps), {}, {
     isHasDate: isHasDate,
-    setBackTooltipVisible: setBackTooltipVisible
+    setBackTooltipVisible: setBackTooltipVisible,
+    isClickAutoRefresh: isClickAutoRefresh
   });
   return /*#__PURE__*/React.createElement("div", {
     className: classnames("cw-range-picker-wrapper", classNameWrapper),
@@ -496,6 +532,12 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
             value: [_value[0], moment()]
           });
         }
+        var _values3 = _values2,
+          resValue = _values3.value;
+        if (isSameDate(resValue[0], resValue[1], "second") || isAfterDate(resValue[0], resValue[1])) {
+          _message.error(localeObj["the-selected-time-does-not-meet-the-rule-limit"]);
+          return;
+        }
         _onChange(_values2);
         var _getHistoryInfo5 = getHistoryInfo(_values2, historyList, locale, format),
           _getHistoryInfo6 = _slicedToArray(_getHistoryInfo5, 2),
@@ -591,8 +633,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
 CWRangePicker.defaultProps = {
   moreItemDropdownPosition: "left",
   growSize: 3,
-  format: "YYYY/MM/DD HH:mm:ss",
-  forceRenderTitle: false
+  format: "YYYY/MM/DD HH:mm:ss"
 };
 CWRangePicker.propTypes = {
   /**
@@ -615,6 +656,10 @@ CWRangePicker.propTypes = {
    * 时间变化的回调onChange({value,isRecently?timeDomain?number?unit?})
    */
   onChange: PropTypes.func,
+  /**
+   * 初始时间数据进入时间返回的回调(*主要针对于最近时间)
+   */
+  onInitChange: PropTypes.func,
   /**
    * 时间跨度的比例,>=2,默认为3
    */

package/lib/CWRangePicker/locale/en_US.js

@@ -30,5 +30,6 @@ export default {
   clear: 'Clear',
   "enter manually": "You can manually enter a query statement in the following format",
   "fit-the-input-format": "Fit the input format",
-  "does-not-match-the-input-format": "Does not match the input format"
+  "does-not-match-the-input-format": "Does not match the input format",
+  "the-selected-time-does-not-meet-the-rule-limit": "If the selected time is the same or exceeds the current time, select another time"
 };

package/lib/CWRangePicker/locale/zh_CN.js

@@ -30,5 +30,6 @@ export default {
   clear: '清空',
   "enter manually": "可根据以下类型，按查询语句格式手动输入",
   "fit-the-input-format": "符合输入格式",
-  "does-not-match-the-input-format": "不符合输入格式,请重新输入"
+  "does-not-match-the-input-format": "不符合输入格式,请重新输入",
+  "the-selected-time-does-not-meet-the-rule-limit": "选择的时间二者相同或者某一时间超过当前时间，请重新选择"
 };

package/lib/CWRangePicker/utils/index.js

@@ -170,6 +170,12 @@ export var echoInputValue = function echoInputValue() {
     }
   } else {
     var _value3;
+    if (isRule) {
+      if (isFoucs) {
+        return recordUnit;
+      }
+      return echoRecentlyTimeTitle(locale, captureUnit);
+    }
     if (Array.isArray(value) && (_value3 = value) !== null && _value3 !== void 0 && _value3.length) {
       return echoAbsoluteTimeTitle(value, format);
     }
@@ -225,7 +231,7 @@ export var getTimeSpanFromValue = function getTimeSpanFromValue(value) {
     value: value,
     timeDomain: timeDomain,
     number: captureUnit[0],
-    unit: captureUnit[1]
+    unit: captureUnit[1] === "mo" ? "M" : captureUnit[1]
   };
 };
 
@@ -379,7 +385,7 @@ export var getCorrectValue = function getCorrectValue(value) {
     returnValue = _objectSpread(_objectSpread({}, returnValue), {}, {
       timeDomain: key,
       number: captureUnit[0],
-      unit: captureUnit[1],
+      unit: captureUnit[1] === "mo" ? "M" : captureUnit[1],
       isRecently: true
     });
     if (!returnValue.value) {
@@ -448,8 +454,8 @@ export var isAfterDate = function isAfterDate(currentDate, compareDate) {
   return currentDate.isAfter(compareDate);
 };
 // 检查一个 moment 是否与另一个 moment 相同
-export var isSameDate = function isSameDate(currentDate, compareDate) {
-  return currentDate.isSame(compareDate);
+export var isSameDate = function isSameDate(currentDate, compareDate, unit) {
+  return unit ? currentDate.isSame(compareDate, unit) : currentDate.isSame(compareDate);
 };
 var isAfterCurrentDate = function isAfterCurrentDate(cloneStartDate, cloneEndDate) {
   var flag = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;

package/lib/CWSelect/index.js

@@ -149,16 +149,16 @@ var CWSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     if (mode) {
       getMapFromArray(defaultValue);
-      if (defaultValue && mode == "multiple") {
-        setActiveKey(defaultValue);
+      if ("defaultValue" in props && mode == "multiple") {
+        setActiveKey(defaultValue || []);
       }
     }
   }, [defaultValue]);
   useEffect(function () {
     if (mode) {
       getMapFromArray(value);
-      if (value && mode == "multiple") {
-        setActiveKey(value);
+      if ("value" in props && mode == "multiple") {
+        setActiveKey(value || []);
       }
     }
   }, [value]);

package/lib/Cascader/index.less

@@ -25,4 +25,8 @@
             }
         }
     }
+}
+// antd4 ：点击空白处浮层不消失问题
+.@{cascader-prefix-cls}-dropdown.@{ant-prefix}-select-dropdown.@{ant-prefix}-slide-up-leave{
+    display: none !important;
 }

package/lib/DropdownDatePicker/assets/Recover.js

@@ -0,0 +1,18 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+import * as React from "react";
+var SvgCalendar = function SvgCalendar(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    width: 14,
+    height: 11,
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), /*#__PURE__*/React.createElement("g", {
+    fill: "none",
+    fillRule: "evenodd"
+  }, /*#__PURE__*/React.createElement("path", {
+    d: "M.428-.539h13.13v13.13H.428z"
+  }), /*#__PURE__*/React.createElement("path", {
+    d: "M.466 2.898a.117.117 0 0 0 0 .174L3.31 5.656a.118.118 0 0 0 .197-.087V3.661h5.813a3.06 3.06 0 0 1 3.061 3.057 3.06 3.06 0 0 1-3.06 3.056H3.196v1.176h6.122a4.236 4.236 0 0 0 4.239-4.232 4.236 4.236 0 0 0-4.239-4.233H3.506V.4a.118.118 0 0 0-.197-.087L.466 2.898Z",
+    fill: "currentColor"
+  })));
+};
+export default SvgCalendar;

package/lib/DropdownDatePicker/index.js

@@ -1,3 +1,4 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import _Dropdown from "@chaoswise/ui/lib/Antd/Dropdown";
 import "@chaoswise/ui/lib/Input/index.less";
 import _Input from "@chaoswise/ui/lib/Input";
@@ -5,9 +6,18 @@ import "@chaoswise/ui/lib/DatePicker/index.less";
 import _DatePicker from "@chaoswise/ui/lib/DatePicker";
 import "@chaoswise/ui/lib/RangePicker/index.less";
 import _RangePicker from "@chaoswise/ui/lib/RangePicker";
+import "@chaoswise/ui/lib/Tooltip/index.less";
+import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
-var _excluded = ["inputPrefixIcon", "className"];
+var _excluded = ["inputPrefixIcon", "className"],
+  _excluded2 = ["value"],
+  _excluded3 = ["value"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -21,8 +31,12 @@ import PropTypes from "prop-types";
 import classnames from "classnames";
 import DropDownMenu from "./DropdownMenu";
 import LiveSvg from "./assets/live";
-import { regroupDataSourceFn, echoInputValue } from "./utils";
+import RecoverSvg from "./assets/Recover";
+import { getLocale } from "./locale";
+import _ from "lodash";
+import { regroupDataSourceFn, echoInputValue, isEmptyObject, funcValueChangeArrayValue, getCorrectValue } from "./utils";
 import moment from "moment";
+import { v4 as uuidv4 } from 'uuid';
 import "./index.less";
 var DropdownDatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue,
@@ -42,6 +56,7 @@ var DropdownDatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
     locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
+  var localeObj = getLocale(locale);
   var _menuOption$showCalen = menuOption.showCalendar,
     showCalendar = _menuOption$showCalen === void 0 ? true : _menuOption$showCalen,
     _menuOption$isRangePi = menuOption.isRangePickerCalendar,
@@ -73,14 +88,29 @@ var DropdownDatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     recordDateValue = _useState6[0],
     setRecordDateValue = _useState6[1];
-  // 是否切换到日历选择
-  var _useState7 = useState(false),
+  // 当前默认时间项
+  var _useState7 = useState({}),
     _useState8 = _slicedToArray(_useState7, 2),
-    isCalendar = _useState8[0],
-    setIsCalendar = _useState8[1];
+    dateValue = _useState8[0],
+    setDateValue = _useState8[1];
+  // 是否切换到日历选择
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    isCalendar = _useState10[0],
+    setIsCalendar = _useState10[1];
   // 特殊时间选择器外壳容器
   var calendarRef = useRef(null);
   // 初始时记录当前时间项
+  useEffect(function () {
+    var dateValue = {};
+    if (value) {
+      dateValue = value;
+    } else if (defaultValue) {
+      dateValue = defaultValue;
+    }
+    setDateValue(dateValue);
+  }, []);
+  // 初始时记录当前时间项
   useEffect(function () {
     if (value) {
       setRecordDateValue(value);
@@ -131,6 +161,45 @@ var DropdownDatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   }, inputPrefixIcon ? inputPrefixIcon : /*#__PURE__*/React.createElement(LiveSvg, {
     className: classnames("cw-dropdown-date-picker-prefix-icon")
   }));
+  // 恢复默认配置
+  var onRecover = function onRecover() {
+    var isEmptyObj = isEmptyObject(dateValue);
+    var values = dateValue.value,
+      key = dateValue.key;
+    var returnValue = dateValue;
+    if (!isEmptyObj) {
+      returnValue = _objectSpread(_objectSpread({}, dateValue), {}, {
+        value: funcValueChangeArrayValue(values)
+      });
+      returnValue = getCorrectValue(returnValue, key);
+    }
+    _onChange(returnValue);
+    if (!value) {
+      setRecordDateValue(returnValue);
+    }
+  };
+  var isEqual = useMemo(function () {
+    var values = recordDateValue.value,
+      rest = _objectWithoutProperties(recordDateValue, _excluded2);
+    var _values = dateValue.value,
+      dateValueRest = _objectWithoutProperties(dateValue, _excluded3);
+    if (isEmptyObject(recordDateValue) && isEmptyObject(dateValue)) {
+      return true;
+    }
+    if (!isEmptyObject(recordDateValue) && !isEmptyObject(dateValue)) {
+      if (_.isEqual(rest, dateValueRest)) {
+        return true;
+      }
+    }
+    return false;
+  }, [recordDateValue, dateValue]);
+  // 输入框尾缀图标
+  var inputSuffix = !isEqual && /*#__PURE__*/React.createElement(_Tooltip, {
+    title: localeObj.recover
+  }, /*#__PURE__*/React.createElement(RecoverSvg, {
+    onClick: onRecover,
+    className: classnames("cw-dropdown-date-picker-suffix-recover")
+  }));
   // 输入框获取焦点
   var onInputFocus = function onInputFocus(e) {
     setIsFocus(true);
@@ -166,12 +235,15 @@ var DropdownDatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       setIsCalendar(false);
       setIsFocus(false);
       if (_value) {
+        var key = uuidv4();
         _onChange({
-          value: _value
+          value: _value,
+          key: key
         });
         if (!value) {
           setRecordDateValue({
-            value: _value
+            value: _value,
+            key: key
           });
         }
       }
@@ -202,12 +274,15 @@ var DropdownDatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       setIsCalendar(false);
       setIsFocus(false);
       if (_value) {
+        var key = uuidv4();
         _onChange({
-          value: [_value]
+          value: [_value],
+          key: key
         });
         if (!value) {
           setRecordDateValue({
-            value: [_value]
+            value: [_value],
+            key: key
           });
         }
       }
@@ -215,7 +290,8 @@ var DropdownDatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     inputReadOnly: true
   }) : null;
   var _renderInputDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Input, _extends({
-    prefix: inputPrefix
+    prefix: inputPrefix,
+    suffix: inputSuffix
   }, _inputOption, {
     className: classnames("cw-dropdown-date-picker-input-wrapper", inputWrapperClassName),
     onFocus: onInputFocus,

package/lib/DropdownDatePicker/locale/en_US.js

@@ -1,4 +1,5 @@
 export default {
+  recover: "Restore default",
   s: "Second",
   m: "Minute",
   h: "Hour",

package/lib/DropdownDatePicker/locale/zh_CN.js

@@ -1,4 +1,5 @@
 export default {
+  recover: "恢复默认值",
   s: "秒",
   m: "分钟",
   h: "小时",

package/lib/DropdownDatePicker/utils/index.js

@@ -241,7 +241,11 @@ export var getCorrectValue = function getCorrectValue(value) {
   }
   if (!isRule && !returnValue.value) {
     delete returnValue.value;
-    delete returnValue.isRecently;
   }
   return returnValue;
-};
+};
+
+// 判断一个值是否为空对象
+export function isEmptyObject(value) {
+  return Object.keys(value).length === 0 && value.constructor === Object;
+}

package/lib/RangePicker/components/ExtraTimeFooter.js

@@ -43,7 +43,10 @@ export default function ExtraTimeFooter(_ref) {
   }, showTime && /*#__PURE__*/React.createElement("div", {
     className: "cw-rangePicker-time"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "cw-rangePicker-leftTime"
+    className: "cw-rangePicker-leftTime",
+    onMouseDown: function onMouseDown(e) {
+      e.stopPropagation();
+    }
   }, /*#__PURE__*/React.createElement(_TimePicker, _extends({
     value: startTimeValue,
     onChange: startChange,
@@ -54,7 +57,10 @@ export default function ExtraTimeFooter(_ref) {
     type: "swap-right",
     className: "cw-rangePicker-swap-icon"
   }), /*#__PURE__*/React.createElement("div", {
-    className: "cw-rangePicker-rightTime"
+    className: "cw-rangePicker-rightTime",
+    onMouseDown: function onMouseDown(e) {
+      e.stopPropagation();
+    }
   }, /*#__PURE__*/React.createElement(_TimePicker, _extends({
     getPopupContainer: getPopupContainer,
     value: endTimeValue,

package/lib/RangePicker/index.js

@@ -165,6 +165,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   // TimePicker开始时间改变触发的事件
   var changeStartTime = function changeStartTime(newStartTime) {
+    if (!newStartTime) return;
     setStartTimeParams(newStartTime);
     isBtnRef.current = false;
     if (Array.isArray(dateValue)) {
@@ -182,6 +183,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   // TimePicker结束时间改变触发的事件
   var changeEndTime = function changeEndTime(newEndTime) {
+    if (!newEndTime) return;
     setEndTimeParams(newEndTime);
     isBtnRef.current = false;
     if (Array.isArray(dateValue)) {
@@ -373,6 +375,9 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     className: "cw-new-range-picker-wrapper",
     ref: wrapperRef
   }, /*#__PURE__*/React.createElement(RangePicker, _extends({
+    popupStyle: {
+      zIndex: 9999
+    },
     panelRender: panelRender ? panelRender : function (panelNode) {
       var rangesToArray = Object.entries(ranges);
       return /*#__PURE__*/React.createElement("div", {

package/lib/RangePicker/index.less

@@ -86,24 +86,39 @@
             }
 
             .@{ant-prefix}-time-picker-panel {
-                top: -232px !important;
-
+                bottom: -28px !important;
+                top: auto !important;
                 .@{ant-prefix}-time-picker-panel-inner {
                     border-radius: 2px !important;
                     width: 160px;
                     left: 0;
+                    display: flex;
+                    flex-direction: column-reverse;
                     .@{ant-prefix}-time-picker-panel-input-wrap {
-                        display: none;
+                        display: flex;
+                        justify-content: center;
+                        align-items: center;
+                        border: @border-width-base @border-style-base @border-color-base;
+                        padding: 0;
+                        height: 28px;
+                        &:hover{
+                            border-color: @primary-5;
+                        }
+                        &:focus-within{
+                            border-color: @primary-color;
+                        }
+                        .@{ant-prefix}-time-picker-panel-input{
+                            text-align: center;
+                        }
                     }
-
                     .@{ant-prefix}-time-picker-panel-combobox {
                         width: 100%;
-                        height: 232px;
+                        height: 200px;
 
                         .@{ant-prefix}-time-picker-panel-select {
                             width: 33.3%;
-                            height: 223px;
-                            max-height: 232px;
+                            height: 200px;
+                            max-height: 200px;
 
                             ul {
                                 width: 100%;

package/lib/SimplePagination/index.js

@@ -91,7 +91,7 @@ function SimplePagination(props) {
     }
     if (current_ < 1) return;
     if (current_ > allPage) return;
-    if (current_ === pageInfo.current) return;
+    if (current_ === _current) return;
     _onChange(current_, _pageSize);
     setPageInfo(_objectSpread(_objectSpread({}, pageInfo), {}, {
       current: current_

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -140,5 +140,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "3f29b1423a4e9dc0fd1f32653b2e7e11540922f5"
+  "gitHead": "59cb2ef17cec258258a9b37afde767275d147c25"
 }