@chaoswise/ui 2.3.1 → 2.3.3

package/lib/BasicLayout/index.js

@@ -4,7 +4,7 @@ import _ErrorBoundary from "@chaoswise/ui/lib/ErrorBoundary";
 import "@chaoswise/ui/lib/Header/index.less";
 import _Header from "@chaoswise/ui/lib/Header";
 import _Layout from "@chaoswise/ui/lib/Antd/Layout";
-var _excluded = ["logo", "headerTitle", "headerExtra", "showHome", "onClickHome", "showTopNavigation", "topNavigation", "topNavigationClassName", "topNavigationTrigger", "onClickTopNavigation", "siderMenu", "children", "siderWidth", "siderCollapsedWidth", "collapsed", "onCollapse", "showHead", "showBreadcrumb", "showBack", "onClickBack", "backNavigationTitle", "backIcon", "showSider", "breadcrumbOptions", "menuOptions", "contentClassName", "currentPath", "className", "version", "versionTooltip", "customContent", "allProductsTitle", "logoText", "localeSwitcherOption", "messageOption", "documentOption", "userSetingOption", "logoSize", "renderSetting", "showMessage", "homeIcon", "contentOption", "ErrorBoundary", "onPassWidth"];
+var _excluded = ["logo", "headerTitle", "headerExtra", "showHome", "onClickHome", "showTopNavigation", "topNavigation", "topNavigationClassName", "topNavigationTrigger", "onClickTopNavigation", "siderMenu", "children", "siderWidth", "siderCollapsedWidth", "collapsed", "onCollapse", "showHead", "showBreadcrumb", "showBack", "onClickBack", "backNavigationTitle", "backIcon", "showSider", "breadcrumbOptions", "menuOptions", "contentClassName", "currentPath", "className", "version", "versionTooltip", "customContent", "allProductsTitle", "logoText", "localeSwitcherOption", "messageOption", "documentOption", "userSetingOption", "logoSize", "renderSetting", "showMessage", "homeIcon", "contentOption", "ErrorBoundary", "onPassWidth", "topNavigationOption"];
 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 _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."); }
@@ -93,6 +93,8 @@ var BasicLayout = function BasicLayout(_ref) {
     ErrorBoundary = _ref$ErrorBoundary === void 0 ? true : _ref$ErrorBoundary,
     _ref$onPassWidth = _ref.onPassWidth,
     onPassWidth = _ref$onPassWidth === void 0 ? function () {} : _ref$onPassWidth,
+    _ref$topNavigationOpt = _ref.topNavigationOption,
+    topNavigationOption = _ref$topNavigationOpt === void 0 ? {} : _ref$topNavigationOpt,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
@@ -271,7 +273,8 @@ var BasicLayout = function BasicLayout(_ref) {
     documentOption: documentOption,
     userSetingOption: userSetingOption,
     showMessage: showMessage,
-    homeIcon: homeIcon
+    homeIcon: homeIcon,
+    topNavigationOption: topNavigationOption
   })), specialContent && /*#__PURE__*/React.createElement("div", {
     className: classnames(specialContentClassName)
   }, specialContent), /*#__PURE__*/React.createElement(_Layout, {
@@ -497,7 +500,17 @@ BasicLayout.propTypes = {
   /**
    * 左侧菜单展开宽度值
    */
-  onPassWidth: PropTypes.func
+  onPassWidth: PropTypes.func,
+  /**
+   * 顶部导航配置(主要针对unfold类型)：{
+   *  topNavigationType: PropTypes.oneOf(["fold", "unfold"]), // 默认为fold，fold会将所有产品折叠收纳，unfold会将所有产品平铺
+   *  activeKey: PropTypes.string, // 受控的活跃的key
+   *  unfoldMaxCount: PropTypes.number // 默认值为4，topNavigationType为unfold类型时，超过unfoldMaxCount数目将会展示到更多中
+   *  moreOverlayClassName: PropTypes.string // 更多浮层类名
+   *  topNavigationWrapperClassName: PropTypes.string // 导航外壳容器类名
+   * }
+   */
+  topNavigationOption: PropTypes.object
 };
 BasicLayout.Footer = Footer;
 export default BasicLayout;

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) {
@@ -33,11 +39,12 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
     setRecordDateValue = props.setRecordDateValue,
     onChange = props.onChange,
     value = props.value,
-    isAutoRefresh = props.isAutoRefresh,
     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 +63,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)
@@ -80,25 +87,33 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
   // 自动刷新
   var onAutoRefresh = function onAutoRefresh() {
     setBackTooltipVisible(false);
-    onClickAutoRefresh(!isAutoRefresh);
+    onClickAutoRefresh(!enableAutoRefresh);
+    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 +131,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);
       }
@@ -138,16 +153,16 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
     title: localeObj["refresh"]
   }, /*#__PURE__*/React.createElement(_Button, {
     onClick: onRefresh,
-    disabled: isDisabledRefresh
+    disabled: isDisabledRefresh || !enableAutoRefresh
   }, /*#__PURE__*/React.createElement(Refresh1Svg, null))), showAutoRefresh && /*#__PURE__*/React.createElement(_Tooltip, {
     title: localeObj["autoRefresh"]
   }, /*#__PURE__*/React.createElement(_Button, {
     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

@@ -24,21 +24,17 @@ var TimeSpan = function TimeSpan(props) {
     isHasDate = props.isHasDate,
     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 +42,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 +76,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 +86,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 +103,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");
     },