@chaoswise/ui 2.3.3 → 2.3.5

package/lib/AbreastLayout/index.js

@@ -115,13 +115,13 @@ function AbreastLayout(_ref) {
     onResizeStart: function onResizeStart() {
       var _rest$onResizeStart;
       setResizable(true);
-      rest === null || rest === void 0 ? void 0 : (_rest$onResizeStart = rest.onResizeStart) === null || _rest$onResizeStart === void 0 ? void 0 : _rest$onResizeStart.call(rest);
+      rest === null || rest === void 0 || (_rest$onResizeStart = rest.onResizeStart) === null || _rest$onResizeStart === void 0 ? void 0 : _rest$onResizeStart.call(rest);
     },
     onResizeStop: function onResizeStop(e, direction, ref, d) {
       var _rest$onResizeStop;
       setLeftNavigationWidth(Number.parseInt(leftNavigationWidth) + d.width);
       setResizable(false);
-      rest === null || rest === void 0 ? void 0 : (_rest$onResizeStop = rest.onResizeStop) === null || _rest$onResizeStop === void 0 ? void 0 : _rest$onResizeStop.call(rest);
+      rest === null || rest === void 0 || (_rest$onResizeStop = rest.onResizeStop) === null || _rest$onResizeStop === void 0 ? void 0 : _rest$onResizeStop.call(rest);
     },
     enable: _objectSpread({
       top: false,

package/lib/CWCascader/rc-cascader/OptionList/index.js

@@ -26,7 +26,7 @@ import Column, { FIX_LABEL } from './Column';
 import useActive from './useActive';
 import useKeyboard from './useKeyboard';
 var RefOptionList = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _optionColumns$, _optionColumns$$optio, _ref3, _classNames;
+  var _optionColumns$, _ref3, _classNames;
   var _useBaseProps = useBaseProps(),
     prefixCls = _useBaseProps.prefixCls,
     multiple = _useBaseProps.multiple,
@@ -181,7 +181,7 @@ var RefOptionList = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, [activeValueCells]);
   // ========================== Render ==========================
   // >>>>> Empty
-  var isEmpty = !((_optionColumns$ = optionColumns[0]) !== null && _optionColumns$ !== void 0 && (_optionColumns$$optio = _optionColumns$.options) !== null && _optionColumns$$optio !== void 0 && _optionColumns$$optio.length);
+  var isEmpty = !((_optionColumns$ = optionColumns[0]) !== null && _optionColumns$ !== void 0 && (_optionColumns$ = _optionColumns$.options) !== null && _optionColumns$ !== void 0 && _optionColumns$.length);
   var emptyList = [(_ref3 = {}, _defineProperty(_ref3, fieldNames.value, '__EMPTY__'), _defineProperty(_ref3, FIX_LABEL, notFoundContent), _defineProperty(_ref3, "disabled", true), _ref3)];
   var columnProps = _objectSpread(_objectSpread({}, props), {}, {
     multiple: !isEmpty && multiple,

package/lib/CWCascader/rc-cascader/hooks/useDisplayValues.js

@@ -32,7 +32,7 @@ export default (function (rawValues, options, fieldNames, multiple, displayRende
       }, []);
     };
     return rawValues.map(function (valueCells) {
-      var _valueOptions, _valueOptions$option;
+      var _valueOptions;
       var valueOptions = toPathOptions(valueCells, options, fieldNames);
       var isBackEndQuery = false;
       if (valueOptions.length && (valueOptions[valueOptions.length - 1].index === -1 || valueOptions[valueOptions.length - 1].index === undefined)) {
@@ -78,7 +78,7 @@ export default (function (rawValues, options, fieldNames, multiple, displayRende
         value: value,
         key: value,
         valueCells: valueCells,
-        disabled: (_valueOptions = valueOptions[valueOptions.length - 1]) === null || _valueOptions === void 0 ? void 0 : (_valueOptions$option = _valueOptions.option) === null || _valueOptions$option === void 0 ? void 0 : _valueOptions$option.disabled
+        disabled: (_valueOptions = valueOptions[valueOptions.length - 1]) === null || _valueOptions === void 0 || (_valueOptions = _valueOptions.option) === null || _valueOptions === void 0 ? void 0 : _valueOptions.disabled
       };
     });
   }, [rawValues, options, fieldNames, displayRender, multiple, labelInValueOption]);

package/lib/CWMessage/index.js

@@ -58,7 +58,9 @@ function Message(props) {
     requestOption = _props$requestOption === void 0 ? {} : _props$requestOption,
     closable = props.closable,
     _props$strongMessageO = props.strongMessageOption,
-    strongMessageOption = _props$strongMessageO === void 0 ? {} : _props$strongMessageO;
+    strongMessageOption = _props$strongMessageO === void 0 ? {} : _props$strongMessageO,
+    _props$onSocketChange = props.onSocketChange,
+    onSocketChange = _props$onSocketChange === void 0 ? function () {} : _props$onSocketChange;
   var _useConfigContext = _useConfigContext2(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -244,6 +246,7 @@ function Message(props) {
                       case 0:
                         _JSON$parse = JSON.parse(data), _JSON$parse$count$tot = _JSON$parse.count.total, total = _JSON$parse$count$tot === void 0 ? 0 : _JSON$parse$count$tot, message = _JSON$parse.message;
                         setMessageTotal(total);
+                        onSocketChange(JSON.parse(data));
                         if (message) {
                           noticeMessage = message.noticeMessage;
                           if (noticeMessage) {
@@ -256,7 +259,7 @@ function Message(props) {
                             }
                           }
                         }
-                      case 3:
+                      case 4:
                       case "end":
                         return _context3.stop();
                     }

package/lib/CWRangePicker/DropdownMenu/index.js

@@ -46,11 +46,14 @@ var DropdownMenu = function DropdownMenu(props) {
     setIsFocus = props.setIsFocus,
     historyList = props.historyList,
     setHistoryList = props.setHistoryList,
-    format = props.format;
+    format = props.format,
+    timeSpanOption = props.timeSpanOption;
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
     locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
   var localeObj = getLocale(locale);
+  var _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
+    timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
   var _menuOption$showCalen = menuOption.showCalendar,
     showCalendar = _menuOption$showCalen === void 0 ? true : _menuOption$showCalen,
     _menuOption$showHisto = menuOption.showHistoryList,
@@ -77,13 +80,13 @@ var DropdownMenu = function DropdownMenu(props) {
       });
       returnValue = getCorrectValue(returnValue, item.key);
       onChange(returnValue);
-      var _getHistoryInfo = getHistoryInfo(returnValue, historyList, locale, format),
+      var _getHistoryInfo = getHistoryInfo(returnValue, historyList, locale, format, timeSpanBoundary),
         _getHistoryInfo2 = _slicedToArray(_getHistoryInfo, 2),
         isRepeat = _getHistoryInfo2[0],
         historyValue = _getHistoryInfo2[1];
       if (!isRepeat) {
         setHistoryList(function (pre) {
-          return [].concat(_toConsumableArray(pre), [historyValue]);
+          return [historyValue].concat(_toConsumableArray(pre));
         });
       }
       if (!_value) {

package/lib/CWRangePicker/Refresh/index.js

@@ -18,14 +18,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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
- * @LastEditors: andrew.qiao andrew.qiao@cloudwise.com
- * @LastEditTime: 2023-03-30 18:18:34
- * @FilePath: /change_01/aops_web_commons/packages/ui/components/CWRangePicker1/Refresh/index.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import React, { forwardRef, useImperativeHandle } from "react";
 import classnames from "classnames";
 import Refresh1Svg from "../assets/Refresh1";
@@ -42,9 +34,9 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
     setIsAutoRefresh = props.setIsAutoRefresh,
     refreshOption = props.refreshOption,
     isHasDate = props.isHasDate,
-    setBackTooltipVisible = props.setBackTooltipVisible,
     enableAutoRefresh = props.enableAutoRefresh,
-    isClickAutoRefresh = props.isClickAutoRefresh;
+    isClickAutoRefresh = props.isClickAutoRefresh,
+    timeSpanOption = props.timeSpanOption;
   var _refreshOption$onAuto = refreshOption.onAutoRefreshChange,
     onAutoRefreshChange = _refreshOption$onAuto === void 0 ? function () {} : _refreshOption$onAuto,
     _refreshOption$onClic = refreshOption.onClickRefresh,
@@ -57,6 +49,8 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
     showAutoRefresh = _refreshOption$showAu === void 0 ? true : _refreshOption$showAu,
     _refreshOption$showRe = refreshOption.showRefresh,
     showRefresh = _refreshOption$showRe === void 0 ? true : _refreshOption$showRe;
+  var _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
+    timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
     locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
@@ -76,7 +70,7 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
           value: computedRecentlyValue(values)
         });
       }
-      if (isRule) {
+      if (isRule && !values) {
         returnValue = _objectSpread(_objectSpread({}, recordDateValue), {}, {
           value: getChangeUnitDate(captureUnit[0], captureUnit[1])
         });
@@ -86,7 +80,6 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   // 自动刷新
   var onAutoRefresh = function onAutoRefresh() {
-    setBackTooltipVisible(false);
     onClickAutoRefresh(!enableAutoRefresh);
     isClickAutoRefresh.current = true;
     if (isHasDate) {
@@ -104,13 +97,13 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
       if (!enableAutoRefresh) {
         if (values) {
           values = computedRecentlyValue(values);
-          finalRecordDateValue = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, finalRecordDateValue), rest), getTimeSpanFromValue(values)), {}, {
+          finalRecordDateValue = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, finalRecordDateValue), rest), getTimeSpanFromValue(values, timeSpanBoundary)), {}, {
             isRecently: true
           });
         }
-        if (isRule) {
+        if (isRule && !values) {
           values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
-          finalRecordDateValue = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, finalRecordDateValue), rest), getTimeSpanFromValue(values)), {}, {
+          finalRecordDateValue = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, finalRecordDateValue), rest), getTimeSpanFromValue(values, timeSpanBoundary)), {}, {
             isRecently: true
           });
         }
@@ -120,7 +113,7 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
             value: computedRecentlyValue(values)
           });
         }
-        if (isRule) {
+        if (isRule && !values) {
           finalRecordDateValue = _objectSpread(_objectSpread({}, finalRecordDateValue), {}, {
             value: getChangeUnitDate(captureUnit[0], captureUnit[1])
           });

package/lib/CWRangePicker/TimeSpan/index.js

@@ -1,8 +1,8 @@
 import "@chaoswise/ui/lib/Tooltip/index.less";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
+import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
 import "@chaoswise/ui/lib/Button/index.less";
 import _Button from "@chaoswise/ui/lib/Button";
-import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
 /*
  * @Author: andrew.qiao andrew.qiao@cloudwise.com
  * @Date: 2022-08-11 18:23:40
@@ -15,22 +15,17 @@ import React from "react";
 import { getChangeDate } from "../utils";
 import { getLocale } from "../locale";
 import "./index.less";
+_Button.__ANT_BUTTON = true;
 var TimeSpan = function TimeSpan(props) {
   var onChange = props.onChange,
-    growSize = props.growSize,
     recordDateValue = props.recordDateValue,
     setRecordDateValue = props.setRecordDateValue,
     _value = props.value,
     isHasDate = props.isHasDate,
     onRecover = props.onRecover,
     timeSpanOption = props.timeSpanOption,
-    forwardTooltipVisible = props.forwardTooltipVisible,
-    setForwardTooltipVisible = props.setForwardTooltipVisible,
-    backTooltipVisible = props.backTooltipVisible,
-    setBackTooltipVisible = props.setBackTooltipVisible,
-    expandTooltipVisible = props.expandTooltipVisible,
-    setExpandTooltipVisible = props.setExpandTooltipVisible,
-    isRightDisabled = props.isRightDisabled;
+    isRightDisabled = props.isRightDisabled,
+    isDisabledEnlargeBtn = props.isDisabledEnlargeBtn;
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
     locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
@@ -45,15 +40,19 @@ var TimeSpan = function TimeSpan(props) {
     tooltipTitleCustom = _timeSpanOption$toolt === void 0 ? {} : _timeSpanOption$toolt,
     forwardIcon = timeSpanOption.forwardIcon,
     backIcon = timeSpanOption.backIcon,
-    expandIcon = timeSpanOption.expandIcon;
+    expandIcon = timeSpanOption.expandIcon,
+    _timeSpanOption$growS = timeSpanOption.growSize,
+    growSize = _timeSpanOption$growS === void 0 ? 3 : _timeSpanOption$growS,
+    _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
+    timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
   var _tooltipTitleCustom$f = tooltipTitleCustom.forwardTitle,
     forwardTitle = _tooltipTitleCustom$f === void 0 ? localeObj["forwardSmooth"] : _tooltipTitleCustom$f,
     _tooltipTitleCustom$b = tooltipTitleCustom.backTitle,
     backTitle = _tooltipTitleCustom$b === void 0 ? localeObj["backSmooth"] : _tooltipTitleCustom$b,
     _tooltipTitleCustom$e = tooltipTitleCustom.expandTitle,
-    expandTitle = _tooltipTitleCustom$e === void 0 ? localeObj["ExpandSpan"] : _tooltipTitleCustom$e;
+    expandTitle = _tooltipTitleCustom$e === void 0 ? localeObj["ExpandSpan"].replace('{span}', "".concat(growSize)) : _tooltipTitleCustom$e;
   var onChangeTimeSpan = function onChangeTimeSpan(direction) {
-    var _getChangeDate = getChangeDate(recordDateValue, direction, growSize),
+    var _getChangeDate = getChangeDate(recordDateValue, direction, growSize, timeSpanBoundary),
       value = _getChangeDate.value,
       isInvalidDate = _getChangeDate.isInvalidDate,
       switchInitial = _getChangeDate.switchInitial;
@@ -70,26 +69,14 @@ var TimeSpan = function TimeSpan(props) {
   return isHasDate && showTimeSpan && /*#__PURE__*/React.createElement(_Button.Group, {
     className: "cw-range-picker-time-span-wrapper"
   }, /*#__PURE__*/React.createElement(_Tooltip, {
-    title: forwardTitle,
-    onVisibleChange: function onVisibleChange(visible) {
-      setForwardTooltipVisible(visible);
-    },
-    visible: forwardTooltipVisible
+    title: forwardTitle
   }, showForwardBtn && /*#__PURE__*/React.createElement(_Button, {
     icon: forwardIcon ? forwardIcon : "caret-left",
     onClick: function onClick() {
       onChangeTimeSpan("left");
-    },
-    onMouseOver: function onMouseOver() {
-      setForwardTooltipVisible(true);
-      setBackTooltipVisible(false);
     }
   })), /*#__PURE__*/React.createElement(_Tooltip, {
-    title: backTitle,
-    visible: isRightDisabled ? false : backTooltipVisible,
-    onVisibleChange: function onVisibleChange(visible) {
-      setBackTooltipVisible(visible);
-    }
+    title: backTitle
   }, showBackwardBtn && /*#__PURE__*/React.createElement(_Button, {
     icon: backIcon ? backIcon : "caret-right",
     onClick: function onClick() {
@@ -97,19 +84,13 @@ var TimeSpan = function TimeSpan(props) {
     },
     disabled: isRightDisabled
   })), showEnlargeBtn && /*#__PURE__*/React.createElement(_Tooltip, {
-    title: expandTitle,
-    onVisibleChange: function onVisibleChange(visible) {
-      setExpandTooltipVisible(visible);
-    },
-    visible: expandTooltipVisible
+    title: expandTitle
   }, /*#__PURE__*/React.createElement(_Button, {
-    icon: expandIcon ? expandIcon : "zoom-out",
+    icon: expandIcon ? expandIcon : "zoom-in",
     onClick: function onClick() {
       onChangeTimeSpan("even");
     },
-    onMouseOver: function onMouseOver() {
-      setExpandTooltipVisible(true);
-    }
+    disabled: isDisabledEnlargeBtn
   })));
 };
 export default TimeSpan;

package/lib/CWRangePicker/index.js

@@ -41,7 +41,7 @@ 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, isSameDate } from "./utils";
+import { regroupDataSourceFn, echoInputValue, getUnit, judgeType, getChangeUnitDate, isInvalidDate, range, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo, getFinalDateOption, getTruthDateCount, isAfterDate, isSameDate, isExceedMaxTimeSpan, getYears, computedRecentlyValue } from "./utils";
 import _ from "lodash";
 import moment from "moment";
 import "./index.less";
@@ -55,8 +55,6 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     _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,
     tipTooltipOption = _props$tipTooltipOpti === void 0 ? {} : _props$tipTooltipOpti,
     _props$menuOption = props.menuOption,
@@ -71,7 +69,9 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     _props$format = props.format,
     format = _props$format === void 0 ? "YYYY/MM/DD HH:mm:ss" : _props$format,
     forceRenderTitle = props.forceRenderTitle,
-    open = props.open;
+    open = props.open,
+    _props$rangePickerFor = props.rangePickerFormat,
+    rangePickerFormat = _props$rangePickerFor === void 0 ? "YYYY/MM/DD" : _props$rangePickerFor;
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
     locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
@@ -87,6 +87,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     showAutoRefresh = _refreshOption$showAu === void 0 ? true : _refreshOption$showAu,
     _refreshOption$isRece = refreshOption.isRecentlyOpenRefresh,
     isRecentlyOpenRefresh = _refreshOption$isRece === void 0 ? true : _refreshOption$isRece;
+  var _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
+    timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
   var _menuOption$showCalen = menuOption.showCalendar,
     showCalendar = _menuOption$showCalen === void 0 ? true : _menuOption$showCalen,
     _menuOption$exceedSho = menuOption.exceedShowInMore,
@@ -137,19 +139,6 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     historyList = _useState14[0],
     setHistoryList = _useState14[1];
-  // 启用禁用状态Button切换导致Tooltip异常特殊处理
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    forwardTooltipVisible = _useState16[0],
-    setForwardTooltipVisible = _useState16[1];
-  var _useState17 = useState(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    backTooltipVisible = _useState18[0],
-    setBackTooltipVisible = _useState18[1];
-  var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    expandTooltipVisible = _useState20[0],
-    setExpandTooltipVisible = _useState20[1];
   // 特殊时间选择器外壳容器
   var calendarRef = useRef(null);
   // 定时器计数
@@ -160,10 +149,10 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var inputRef = useRef(null);
   // 含有刷新组件暴露的方法
   var refreshRef = useRef(null);
-  var _useState21 = useState([]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    rangePickerValue = _useState22[0],
-    setRangePickerValue = _useState22[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    rangePickerValue = _useState16[0],
+    setRangePickerValue = _useState16[1];
   // 组件内部方法抛出
   useImperativeHandle(ref, function () {
     var _refreshRef$current;
@@ -221,24 +210,27 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   }, [openAutoRefresh, isAutoRefresh]);
   // 输入框回显
   useEffect(function () {
-    setInputValue(echoInputValue(recordDateValue, isFocus, locale, format, forceRenderTitle, enableAutoRefresh));
-  }, [recordDateValue, isFocus, locale, format, forceRenderTitle, enableAutoRefresh]);
+    setInputValue(echoInputValue(recordDateValue, isFocus, locale, format, forceRenderTitle, enableAutoRefresh, timeSpanBoundary));
+  }, [recordDateValue, isFocus, locale, format, forceRenderTitle, enableAutoRefresh, timeSpanBoundary]);
   useEffect(function () {
     var _judgeType3 = judgeType(recordDateValue),
       _judgeType4 = _slicedToArray(_judgeType3, 1),
       isRule = _judgeType4[0];
     var isHasDate = !isRule && !recordDateValue.value ? false : true;
-    var _isAutoRefresh = false;
+    var _isAutoRefresh = enableAutoRefresh;
     if (isHasDate) {
       if (!isRecentlyOpenRefresh) {
         if (!isRule) {
           if (enableAutoRefresh) {
             onAutoRefreshChange(false);
+            _isAutoRefresh = false;
           }
         } else {
           if (isRule && isClickAutoRefresh.current) {
-            onAutoRefreshChange(true);
-            _isAutoRefresh = true;
+            if (!enableAutoRefresh) {
+              onAutoRefreshChange(true);
+              _isAutoRefresh = true;
+            }
           }
         }
         isClickAutoRefresh.current = false;
@@ -251,6 +243,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         } else {
           if (enableAutoRefresh) {
             onAutoRefreshChange(false);
+            _isAutoRefresh = false;
           }
         }
       }
@@ -268,11 +261,18 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       recordUnit = _judgeType6[2];
     if (enableAutoRefresh && isRule && showAutoRefresh) {
       timeRef.current = setInterval(function () {
+        var _values = [];
+        if (values) {
+          _values = computedRecentlyValue(values);
+          if (!values) {
+            _values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
+          }
+        }
         var newValue = _objectSpread(_objectSpread({}, recordDateValue), {}, {
           timeDomain: recordUnit,
           number: captureUnit[0],
           unit: captureUnit[1] === "mo" ? "M" : captureUnit[1],
-          value: getChangeUnitDate(captureUnit[0], captureUnit[1]),
+          value: _values,
           isRecently: true
         });
         onAutoRefresh(newValue);
@@ -298,19 +298,27 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       values = funcValueChangeArrayValue(values);
       var isHasDate = true;
       var isRightDisabled = false;
+      var isDisabledEnlargeBtn = false;
+      var years = getYears(timeSpanBoundary);
       if (isRule) {
         isRightDisabled = true;
-        values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
+        if (!values) {
+          values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
+        }
+        if (captureUnit[1] === "y" && Number(captureUnit[0]) >= years) {
+          isDisabledEnlargeBtn = true;
+        }
       }
       if (!isRule && !values) {
         isHasDate = false;
       }
-      return [isHasDate, values, isRightDisabled];
-    }, [recordDateValue]),
-    _useMemo2 = _slicedToArray(_useMemo, 3),
+      return [isHasDate, values, isRightDisabled, isDisabledEnlargeBtn];
+    }, [recordDateValue, timeSpanBoundary]),
+    _useMemo2 = _slicedToArray(_useMemo, 4),
     isHasDate = _useMemo2[0],
     _defaultValue = _useMemo2[1],
-    isRightDisabled = _useMemo2[2];
+    isRightDisabled = _useMemo2[2],
+    isDisabledEnlargeBtn = _useMemo2[3];
   // 点击空白处日历切换
   useEffect(function () {
     document.addEventListener("click", clickBody);
@@ -431,15 +439,20 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       var isInvalidDate_ = isInvalidDate(returnValue.value);
       if (!isInvalidDate_) {
         // message.success(localeObj["fit-the-input-format"]);
+        var passValue = returnValue.value;
+        if (isExceedMaxTimeSpan(passValue, timeSpanBoundary)) {
+          _message.error(localeObj["the-maximum-time-span-is-exceeded"]);
+          return;
+        }
         _onChange(returnValue);
         setIsFocus(false);
-        var _getHistoryInfo = getHistoryInfo(returnValue, historyList, locale, format),
+        var _getHistoryInfo = getHistoryInfo(returnValue, historyList, locale, format, timeSpanBoundary),
           _getHistoryInfo2 = _slicedToArray(_getHistoryInfo, 2),
           isRepeat = _getHistoryInfo2[0],
           historyValue = _getHistoryInfo2[1];
         if (!isRepeat) {
           setHistoryList(function (pre) {
-            return [].concat(_toConsumableArray(pre), [historyValue]);
+            return [historyValue].concat(_toConsumableArray(pre));
           });
         }
         if (!value) {
@@ -456,15 +469,20 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         var _returnValue = getCorrectValue({
           value: _dateValue2
         });
+        var _passValue = _returnValue.value;
+        if (isExceedMaxTimeSpan(_passValue, timeSpanBoundary)) {
+          _message.error(localeObj["the-maximum-time-span-is-exceeded"]);
+          return;
+        }
         _onChange(_returnValue);
         setIsFocus(false);
-        var _getHistoryInfo3 = getHistoryInfo(_returnValue, historyList, locale, format),
+        var _getHistoryInfo3 = getHistoryInfo(_returnValue, historyList, locale, format, timeSpanBoundary),
           _getHistoryInfo4 = _slicedToArray(_getHistoryInfo3, 2),
           _isRepeat = _getHistoryInfo4[0],
           _historyValue = _getHistoryInfo4[1];
         if (!_isRepeat) {
           setHistoryList(function (pre) {
-            return [].concat(_toConsumableArray(pre), [_historyValue]);
+            return [_historyValue].concat(_toConsumableArray(pre));
           });
         }
         if (!value) {
@@ -484,7 +502,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     isAutoRefresh: isAutoRefresh,
     setIsAutoRefresh: setIsAutoRefresh,
     refreshOption: refreshOption,
-    enableAutoRefresh: enableAutoRefresh
+    enableAutoRefresh: enableAutoRefresh,
+    timeSpanOption: timeSpanOption
   };
   var dropdownMenuProps = _objectSpread(_objectSpread({}, commonProps), {}, {
     dataSource: dataSource,
@@ -499,21 +518,13 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var timeSpanProps = _objectSpread(_objectSpread({}, commonProps), {}, {
     dataSource: dataSource,
-    growSize: growSize,
     isHasDate: isHasDate,
     onRecover: onRecover,
-    timeSpanOption: timeSpanOption,
-    forwardTooltipVisible: forwardTooltipVisible,
-    setForwardTooltipVisible: setForwardTooltipVisible,
-    backTooltipVisible: backTooltipVisible,
-    setBackTooltipVisible: setBackTooltipVisible,
-    expandTooltipVisible: expandTooltipVisible,
-    setExpandTooltipVisible: setExpandTooltipVisible,
-    isRightDisabled: isRightDisabled
+    isRightDisabled: isRightDisabled,
+    isDisabledEnlargeBtn: isDisabledEnlargeBtn
   });
   var refreshProps = _objectSpread(_objectSpread({}, commonProps), {}, {
     isHasDate: isHasDate,
-    setBackTooltipVisible: setBackTooltipVisible,
     isClickAutoRefresh: isClickAutoRefresh
   });
   return /*#__PURE__*/React.createElement("div", {
@@ -528,7 +539,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       return getPopupContainerCalendar ? getPopupContainerCalendar(triggerNode) : triggerNode;
     },
     dropdownClassName: classnames(dropdownCalendarClassName),
-    format: format,
+    format: rangePickerFormat,
     allowClear: false,
     onChange: function onChange(_value, mode) {
       setIsCalendar(false);
@@ -548,14 +559,18 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           _message.error(localeObj["the-selected-time-does-not-meet-the-rule-limit"]);
           return;
         }
+        if (isExceedMaxTimeSpan(resValue, timeSpanBoundary)) {
+          _message.error(localeObj["the-maximum-time-span-is-exceeded"]);
+          return;
+        }
         _onChange(_values2);
-        var _getHistoryInfo5 = getHistoryInfo(_values2, historyList, locale, format),
+        var _getHistoryInfo5 = getHistoryInfo(_values2, historyList, locale, format, timeSpanBoundary),
           _getHistoryInfo6 = _slicedToArray(_getHistoryInfo5, 2),
           isRepeat = _getHistoryInfo6[0],
           historyValue = _getHistoryInfo6[1];
         if (!isRepeat) {
           setHistoryList(function (pre) {
-            return [].concat(_toConsumableArray(pre), [historyValue]);
+            return [historyValue].concat(_toConsumableArray(pre));
           });
         }
         if (!value) {
@@ -613,31 +628,23 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         data0 = _ref2[0],
         data1 = _ref2[1];
       var range = info.range;
-      var _ref3 = rangePickerValue || [],
-        _ref4 = _slicedToArray(_ref3, 2),
-        value0 = _ref4[0],
-        value1 = _ref4[1];
       if (range === "start" && data0) {
-        if (value0) {
-          data0 = moment(data0).set({
-            "hour": 0,
-            "minute": 0,
-            "second": 0,
-            "millisecond": 0
-          });
-        }
+        data0 = moment(data0).set({
+          "hour": 0,
+          "minute": 0,
+          "second": 0,
+          "millisecond": 0
+        });
       }
       if (range === "end" && data1) {
-        if (value1 && !moment(value1).isSame(data1, "day")) {
-          data1 = moment(data1).set({
-            "hour": 23,
-            "minute": 59,
-            "second": 59,
-            "millisecond": 0
-          });
-          if (moment().isSame(data1, "day")) {
-            data1 = moment();
-          }
+        data1 = moment(data1).set({
+          "hour": 23,
+          "minute": 59,
+          "second": 59,
+          "millisecond": 0
+        });
+        if (moment().isSame(data1, "day")) {
+          data1 = moment();
         }
       }
       setRangePickerValue([data0, data1]);
@@ -677,8 +684,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
 });
 CWRangePicker.defaultProps = {
   moreItemDropdownPosition: "left",
-  growSize: 3,
-  format: "YYYY/MM/DD HH:mm:ss"
+  format: "YYYY/MM/DD HH:mm:ss",
+  rangePickerFormat: "YYYY/MM/DD"
 };
 CWRangePicker.propTypes = {
   /**
@@ -705,10 +712,6 @@ CWRangePicker.propTypes = {
    * 初始时间数据进入时间返回的回调(*主要针对于最近时间)
    */
   onInitChange: PropTypes.func,
-  /**
-   * 时间跨度的比例,>=2,默认为3
-   */
-  growSize: PropTypes.number,
   /**
    * 提示信息TooltipOption
    */
@@ -760,6 +763,10 @@ CWRangePicker.propTypes = {
   /**
    * 下拉菜单日历模式的className属性
    */
-  dropdownCalendarClassName: PropTypes.string
+  dropdownCalendarClassName: PropTypes.string,
+  /**
+   * 日历选择模式format展示
+   */
+  rangePickerFormat: PropTypes.string
 };
 export default CWRangePicker;