@chaoswise/ui 2.3.0 → 2.3.2

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

@@ -102,74 +102,70 @@ export default (function (ref, options, fieldNames, activeValueCells, setActiveV
     return {
       // scrollTo: treeRef.current?.scrollTo,
       onKeyDown: function onKeyDown(event) {
-        var which = event.which;
-        switch (which) {
-          // >>> Arrow keys
-          case KeyCode.UP:
-          case KeyCode.DOWN:
-            {
-              var offset = 0;
-              if (which === KeyCode.UP) {
-                offset = -1;
-              } else if (which === KeyCode.DOWN) {
-                offset = 1;
-              }
-              if (offset !== 0) {
-                offsetActiveOption(offset);
-              }
-              break;
-            }
-          case KeyCode.LEFT:
-            {
-              if (rtl) {
-                nextColumn();
-              } else {
-                prevColumn();
-              }
-              break;
-            }
-          case KeyCode.RIGHT:
-            {
-              if (rtl) {
-                prevColumn();
-              } else {
-                nextColumn();
-              }
-              break;
-            }
-          case KeyCode.BACKSPACE:
-            {
-              if (!searchValue) {
-                prevColumn();
-              }
-              break;
-            }
-          // >>> Select
-          case KeyCode.ENTER:
-            {
-              if (validActiveValueCells.length) {
-                var option = lastActiveOptions[lastActiveIndex];
-                // Search option should revert back of origin options
-                var originOptions = (option === null || option === void 0 ? void 0 : option[SEARCH_MARK]) || [];
-                if (originOptions.length) {
-                  onKeyBoardSelect(originOptions.map(function (opt) {
-                    return opt[fieldNames.value];
-                  }), originOptions[originOptions.length - 1]);
-                } else {
-                  onKeyBoardSelect(validActiveValueCells, lastActiveOptions[lastActiveIndex]);
-                }
-              }
-              break;
-            }
-          // >>> Close
-          case KeyCode.ESC:
-            {
-              toggleOpen(false);
-              if (open) {
-                event.stopPropagation();
-              }
-            }
-        }
+        //   const { which } = event;
+        //   switch (which) {
+        //       // >>> Arrow keys
+        //       case KeyCode.UP:
+        //       case KeyCode.DOWN: {
+        //           let offset = 0;
+        //           if (which === KeyCode.UP) {
+        //               offset = -1;
+        //           }
+        //           else if (which === KeyCode.DOWN) {
+        //               offset = 1;
+        //           }
+        //           if (offset !== 0) {
+        //               offsetActiveOption(offset);
+        //           }
+        //           break;
+        //       }
+        //       case KeyCode.LEFT: {
+        //           if (rtl) {
+        //               nextColumn();
+        //           }
+        //           else {
+        //               prevColumn();
+        //           }
+        //           break;
+        //       }
+        //       case KeyCode.RIGHT: {
+        //           if (rtl) {
+        //               prevColumn();
+        //           }
+        //           else {
+        //               nextColumn();
+        //           }
+        //           break;
+        //       }
+        //       case KeyCode.BACKSPACE: {
+        //           if (!searchValue) {
+        //               prevColumn();
+        //           }
+        //           break;
+        //       }
+        //       // >>> Select
+        //       case KeyCode.ENTER: {
+        //           if (validActiveValueCells.length) {
+        //               const option = lastActiveOptions[lastActiveIndex];
+        //               // Search option should revert back of origin options
+        //               const originOptions = option?.[SEARCH_MARK] || [];
+        //               if (originOptions.length) {
+        //                   onKeyBoardSelect(originOptions.map(opt => opt[fieldNames.value]), originOptions[originOptions.length - 1]);
+        //               }
+        //               else {
+        //                   onKeyBoardSelect(validActiveValueCells, lastActiveOptions[lastActiveIndex]);
+        //               }
+        //           }
+        //           break;
+        //       }
+        //       // >>> Close
+        //       case KeyCode.ESC: {
+        //           toggleOpen(false);
+        //           if (open) {
+        //               event.stopPropagation();
+        //           }
+        //       }
+        //   }
       },
       onKeyUp: function onKeyUp() {}
     };

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

@@ -5,18 +5,18 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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 _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 { toPathOptions } from '../utils/treeUtil';
-import * as React from 'react';
-import { toPathKey } from '../utils/commonUtil';
-export default (function (rawValues, options, fieldNames, multiple, displayRender) {
+import { toPathOptions } from "../utils/treeUtil";
+import * as React from "react";
+import { toPathKey } from "../utils/commonUtil";
+export default (function (rawValues, options, fieldNames, multiple, displayRender, labelInValueOption) {
   return React.useMemo(function () {
     var mergedDisplayRender = displayRender ||
     // Default displayRender
     function (labels) {
       var mergedLabels = multiple ? labels.slice(-1) : labels;
-      var SPLIT = ' / ';
+      var SPLIT = " / ";
       if (mergedLabels.every(function (label) {
-        return ['string', 'number'].includes(_typeof(label));
+        return ["string", "number"].includes(_typeof(label));
       })) {
         return mergedLabels.join(SPLIT);
       }
@@ -34,15 +34,44 @@ export default (function (rawValues, options, fieldNames, multiple, displayRende
     return rawValues.map(function (valueCells) {
       var _valueOptions, _valueOptions$option;
       var valueOptions = toPathOptions(valueCells, options, fieldNames);
-      var label = mergedDisplayRender(valueOptions.map(function (_ref) {
-        var _option$fieldNames$la;
-        var option = _ref.option,
-          value = _ref.value;
-        return (_option$fieldNames$la = option === null || option === void 0 ? void 0 : option[fieldNames.label]) !== null && _option$fieldNames$la !== void 0 ? _option$fieldNames$la : value;
-      }), valueOptions.map(function (_ref2) {
-        var option = _ref2.option;
-        return option;
-      }));
+      var isBackEndQuery = false;
+      if (valueOptions.length && (valueOptions[valueOptions.length - 1].index === -1 || valueOptions[valueOptions.length - 1].index === undefined)) {
+        var findItem = labelInValueOption.find(function (item) {
+          return item.value == valueCells;
+        });
+        if (findItem) {
+          isBackEndQuery = true;
+          valueOptions[valueOptions.length - 1].option = {
+            value: valueOptions[valueOptions.length - 1].value,
+            label: findItem.label
+          };
+        }
+      }
+      var label;
+      if (isBackEndQuery) {
+        label = mergedDisplayRender(valueOptions.map(function (_ref) {
+          var option = _ref.option,
+            value = _ref.value;
+          return option === null || option === void 0 ? void 0 : option[fieldNames.label];
+        }).filter(Boolean), valueOptions.map(function (_ref2) {
+          var option = _ref2.option,
+            value = _ref2.value;
+          return option !== null && option !== void 0 ? option : {
+            label: undefined,
+            value: value
+          };
+        }));
+      } else {
+        label = mergedDisplayRender(valueOptions.map(function (_ref3) {
+          var _option$fieldNames$la;
+          var option = _ref3.option,
+            value = _ref3.value;
+          return (_option$fieldNames$la = option === null || option === void 0 ? void 0 : option[fieldNames.label]) !== null && _option$fieldNames$la !== void 0 ? _option$fieldNames$la : value;
+        }), valueOptions.map(function (_ref4) {
+          var option = _ref4.option;
+          return option;
+        }));
+      }
       var value = toPathKey(valueCells);
       return {
         label: label,
@@ -52,5 +81,5 @@ export default (function (rawValues, options, fieldNames, multiple, displayRende
         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
       };
     });
-  }, [rawValues, options, fieldNames, displayRender, multiple]);
+  }, [rawValues, options, fieldNames, displayRender, multiple, labelInValueOption]);
 });

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

@@ -4,14 +4,6 @@ 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); }
-/*
- * @Author: andrew.qiao andrew.qiao@cloudwise.com
- * @Date: 2023-05-30 06:35:28
- * @LastEditors: andrew.qiao andrew.qiao@cloudwise.com
- * @LastEditTime: 2023-05-30 06:48:47
- * @FilePath: /change_01/aops_web_commons/packages/ui/components/Cascaders copy/rc-cascader/hooks/useEntities.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import * as React from 'react';
 import { convertDataToEntities } from 'rc-cascader/node_modules/rc-tree/lib/utils/treeUtil';
 import { VALUE_SPLIT } from '../utils/commonUtil';

package/lib/CWCascader/rc-cascader/utils/treeUtil.js

@@ -1,4 +1,4 @@
-import { SHOW_CHILD } from './commonUtil';
+import { SHOW_CHILD } from "./commonUtil";
 export function formatStrategyValues(pathKeys, getKeyPathEntities, showCheckedStrategy) {
   var valueSet = new Set(pathKeys);
   var keyPathEntities = getKeyPathEntities();
@@ -13,8 +13,11 @@ export function formatStrategyValues(pathKeys, getKeyPathEntities, showCheckedSt
 }
 export function toPathOptions(valueCells, options, fieldNames) {
   var stringMode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var labelInValue = arguments.length > 4 ? arguments[4] : undefined;
+  var labelInValueOption = arguments.length > 5 ? arguments[5] : undefined;
   var currentList = options;
   var valueOptions = [];
+  var isHit = true;
   var _loop = function _loop() {
     var _currentList, _currentList2, _foundOption$fieldNam;
     var valueCell = valueCells[i];
@@ -23,6 +26,9 @@ export function toPathOptions(valueCells, options, fieldNames) {
       return stringMode ? String(val) === String(valueCell) : val === valueCell;
     });
     var foundOption = foundIndex !== -1 ? (_currentList2 = currentList) === null || _currentList2 === void 0 ? void 0 : _currentList2[foundIndex] : null;
+    if (foundIndex === -1) {
+      isHit = false;
+    }
     valueOptions.push({
       value: (_foundOption$fieldNam = foundOption === null || foundOption === void 0 ? void 0 : foundOption[fieldNames.value]) !== null && _foundOption$fieldNam !== void 0 ? _foundOption$fieldNam : valueCell,
       index: foundIndex,
@@ -33,5 +39,43 @@ export function toPathOptions(valueCells, options, fieldNames) {
   for (var i = 0; i < valueCells.length; i += 1) {
     _loop();
   }
+  if (!isHit && labelInValue) {
+    var findOption = labelInValueOption.find(function (item) {
+      return item.value === valueCells;
+    });
+    if (findOption) {
+      valueOptions = [{
+        option: {
+          value: findOption.value,
+          label: findOption.label,
+          backEndQuery: true
+        }
+      }];
+    }
+  }
   return valueOptions;
+}
+export function toValueAndLabel(valueOptions) {
+  var triggerValues = [];
+  valueOptions.forEach(function (item) {
+    var isBackEndQuery = item.some(function (i) {
+      return i.backEndQuery;
+    });
+    if (isBackEndQuery) {
+      triggerValues.push({
+        label: item[0].label,
+        value: item[0].value
+      });
+    } else {
+      var value = [];
+      item.forEach(function (i) {
+        value.push(i.value);
+      });
+      triggerValues.push({
+        label: item[item.length - 1].label,
+        value: value
+      });
+    }
+  });
+  return triggerValues;
 }

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;
@@ -190,7 +163,7 @@ var DropdownMenu = function DropdownMenu(props) {
       "cw-dropdown-menu-more-wrapper-left": moreItemDropdownPosition === "left"
     }),
     getPopupContainer: function getPopupContainer(triggerNode) {
-      return triggerNode.parentNode;
+      return triggerNode;
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classnames("cw-dropdown-menu-_item", "cw-dropdown-menu-item-more")

package/lib/CWRangePicker/DropdownMenu/index.less

@@ -26,7 +26,7 @@
         color: @text-color;
         font-weight: normal;
         font-size: @dropdown-font-size;
-        line-height: @dropdown-line-height;
+        line-height: 22px; // 整体32px的高度
 
         .cw-range-picker-menu-item-calendar {
             width: 14px;
@@ -46,19 +46,22 @@
     }
 
     .cw-dropdown-menu-item-more {
+        position: relative;
         justify-content: space-between;
-
+        overflow: visible;
     }
 
 
     .cw-dropdown-menu-more-wrapper {
         width: 384px;
-        top: 0 !important;
-        left: 362px !important;
+        top: auto !important;
+        bottom: -32px !important;
+        left: calc(100% + 2px) !important;
         box-shadow: @box-shadow-base;
 
         &.cw-dropdown-menu-more-wrapper-left {
-            left: -386px !important;
+            right: calc(100% + 2px) !important;
+            left: auto !important;
         }
     }
     .cw-dropdown-menu-history-outer-wrapper{
@@ -102,10 +105,11 @@
     .cw-dropdown-menu-history-more-wrapper {
         width: 384px;
         top: 0 !important;
-        left: 362px !important;
+        left: calc(100% + 2px) !important;
         box-shadow: @box-shadow-base;
         &.cw-dropdown-menu-history-more-wrapper-left {
-            left: -386px !important;
+            right: calc(100% + 2px) !important;
+            left: auto !important;
         }
       }
 }

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");
     },