@chaoswise/ui 2.3.1 → 2.3.3

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,11 @@ 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,
+    _refreshOption$showAu = refreshOption.showAutoRefresh,
+    showAutoRefresh = _refreshOption$showAu === void 0 ? true : _refreshOption$showAu,
+    _refreshOption$isRece = refreshOption.isRecentlyOpenRefresh,
+    isRecentlyOpenRefresh = _refreshOption$isRece === void 0 ? true : _refreshOption$isRece;
   var _menuOption$showCalen = menuOption.showCalendar,
     showCalendar = _menuOption$showCalen === void 0 ? true : _menuOption$showCalen,
     _menuOption$exceedSho = menuOption.exceedShowInMore,
@@ -151,10 +155,15 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   // 定时器计数
   var timeRef = useRef(null);
   var isInputRef = useRef(false); // 标记，输入框非默认值，输入内容
+  var isClickAutoRefresh = useRef(false); // 标记 点击自动刷新按钮
   // 输入框处理聚焦失焦
   var inputRef = useRef(null);
   // 含有刷新组件暴露的方法
   var refreshRef = useRef(null);
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    rangePickerValue = _useState22[0],
+    setRangePickerValue = _useState22[1];
   // 组件内部方法抛出
   useImperativeHandle(ref, function () {
     var _refreshRef$current;
@@ -177,11 +186,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 +216,49 @@ 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;
+    var _isAutoRefresh = false;
     if (isHasDate) {
-      setIsAutoRefresh(function (pre) {
-        if (recordDateValue.isRecently || isRule) {
-          if (!pre) {
+      if (!isRecentlyOpenRefresh) {
+        if (!isRule) {
+          if (enableAutoRefresh) {
+            onAutoRefreshChange(false);
+          }
+        } else {
+          if (isRule && isClickAutoRefresh.current) {
+            onAutoRefreshChange(true);
+            _isAutoRefresh = true;
+          }
+        }
+        isClickAutoRefresh.current = false;
+      } else {
+        if (isRule) {
+          if (!enableAutoRefresh) {
             onAutoRefreshChange(true);
+            _isAutoRefresh = true;
           }
-          return true;
         } else {
-          if (pre) {
+          if (enableAutoRefresh) {
             onAutoRefreshChange(false);
           }
-          return false;
         }
-      });
+      }
+      setIsAutoRefresh(_isAutoRefresh);
+    } else {
+      isClickAutoRefresh.current = false;
     }
-  }, [recordDateValue]);
+  }, [recordDateValue, isRecentlyOpenRefresh]);
   useEffect(function () {
     var values = recordDateValue.value;
     var _judgeType5 = judgeType(recordDateValue),
@@ -223,19 +266,19 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       isRule = _judgeType6[0],
       captureUnit = _judgeType6[1],
       recordUnit = _judgeType6[2];
-    if (isAutoRefresh && isRule && openAutoRefresh) {
+    if (enableAutoRefresh && isRule && showAutoRefresh) {
       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 && showAutoRefresh) {
       timeRef.current = setInterval(function () {
         onAutoRefresh(recordDateValue);
       }, delay);
@@ -243,14 +286,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     return function () {
       clearInterval(timeRef.current);
     };
-  }, [isAutoRefresh, recordDateValue, delay, openAutoRefresh]);
-  // 点击空白处日历切换
-  useEffect(function () {
-    document.addEventListener("click", clickBody);
-    return function () {
-      document.removeEventListener("click", clickBody);
-    };
-  }, []);
+  }, [enableAutoRefresh, recordDateValue, delay, showAutoRefresh]);
   // 日期是否存在
   var _useMemo = useMemo(function () {
       // 不符合最近时间格式和没有日期数据返回false
@@ -260,15 +296,31 @@ 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];
+  // 点击空白处日历切换
+  useEffect(function () {
+    document.addEventListener("click", clickBody);
+    return function () {
+      document.removeEventListener("click", clickBody);
+    };
+  }, [_defaultValue]);
+  useEffect(function () {
+    setRangePickerValue(_defaultValue);
+  }, [_defaultValue]);
   // 重组数据源
   var regroupDataSource = useMemo(function () {
     if (exceedShowInMore) {
@@ -283,6 +335,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     if (targetCalendar) {
       if (!targetCalendar.contains(e.target)) {
         setIsCalendar(false);
+        setRangePickerValue(_defaultValue);
       }
     }
     if (targetInput) {
@@ -299,17 +352,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);
@@ -366,7 +408,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   // 外部获取ref停止自动刷新
   var onStop = function onStop() {
-    if (isAutoRefresh) {
+    if (enableAutoRefresh) {
       var _refreshRef$current2, _refreshRef$current3;
       ((_refreshRef$current2 = refreshRef.current) === null || _refreshRef$current2 === void 0 ? void 0 : _refreshRef$current2.onAutoRefresh) && ((_refreshRef$current3 = refreshRef.current) === null || _refreshRef$current3 === void 0 ? void 0 : _refreshRef$current3.onAutoRefresh());
     }
@@ -441,7 +483,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 +508,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),
@@ -484,6 +529,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     },
     dropdownClassName: classnames(dropdownCalendarClassName),
     format: format,
+    allowClear: false,
     onChange: function onChange(_value, mode) {
       setIsCalendar(false);
       setIsFocus(false);
@@ -496,6 +542,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),
@@ -553,8 +605,43 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
     },
-    defaultValue: _defaultValue // 默认为当前已经选择的时间
+    value: rangePickerValue // 默认为当前已经选择的时间
     ,
+    onCalendarChange: function onCalendarChange(data, dataString, info) {
+      var _ref = data || [],
+        _ref2 = _slicedToArray(_ref, 2),
+        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
+          });
+        }
+      }
+      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();
+          }
+        }
+      }
+      setRangePickerValue([data0, data1]);
+    },
     showTime: {
       hideDisabledOptions: true
     }
@@ -591,8 +678,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 +701,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

@@ -162,17 +162,27 @@ export var echoInputValue = function echoInputValue() {
   }
   if (!isRule && !values) return title || "Live Tail";
   if (isAutoRefresh) {
+    var _value3;
     if (isRule) {
       if (isFoucs) {
         return recordUnit;
       }
       return echoRecentlyTimeTitle(locale, captureUnit);
     }
-  } else {
-    var _value3;
     if (Array.isArray(value) && (_value3 = value) !== null && _value3 !== void 0 && _value3.length) {
       return echoAbsoluteTimeTitle(value, format);
     }
+  } else {
+    var _value4;
+    if (isRule) {
+      if (isFoucs) {
+        return recordUnit;
+      }
+      return echoRecentlyTimeTitle(locale, captureUnit);
+    }
+    if (Array.isArray(value) && (_value4 = value) !== null && _value4 !== void 0 && _value4.length) {
+      return echoAbsoluteTimeTitle(value, format);
+    }
   }
 };
 
@@ -225,7 +235,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 +389,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 +458,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]);
@@ -187,6 +187,10 @@ var CWSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       var rcSelect = selectRef.current;
       var selectWrapperDom = ReactDom.findDOMNode(rcSelect);
       var selectInputDom = selectWrapperDom.querySelector(".".concat(prefixCls, "-select-selector"));
+      var ExistingSlotDom = selectInputDom.querySelector(".cw-select-custom-slot-wrapper");
+      if (ExistingSlotDom) {
+        selectInputDom.removeChild(ExistingSlotDom);
+      }
       var selectSearchDom = selectInputDom.querySelector(".".concat(prefixCls, "-select-selection-search"));
       var divEle = document.createElement('div');
       divEle.className = "cw-select-custom-slot-wrapper";

package/lib/CWTable/header.js

@@ -3,7 +3,7 @@ import _TooltipText from "@chaoswise/ui/lib/TooltipText";
 import _Dropdown from "@chaoswise/ui/lib/Antd/Dropdown";
 import _Menu from "@chaoswise/ui/lib/Menu";
 var _excluded = ["onResize", "width"],
-  _excluded2 = ["children"];
+  _excluded2 = ["children", "onClick"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -13,7 +13,7 @@ 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; }
-import React, { useState } from "react";
+import React, { useState, useRef } from "react";
 import { Resizable } from "react-resizable";
 import SortContext from "./SortContext";
 import SortSvg from './icon/SortSvg';
@@ -83,6 +83,7 @@ export function HeaderCell(props) {
   var _onResize = props.onResize,
     width = props.width,
     restProps = _objectWithoutProperties(props, _excluded);
+  var isResizeRef = useRef(null);
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -129,6 +130,8 @@ export function HeaderCell(props) {
       restProps.children = children;
     }
     var _children = restProps.children,
+      _restProps$onClick = restProps.onClick,
+      _onClick = _restProps$onClick === void 0 ? function () {} : _restProps$onClick,
       rest = _objectWithoutProperties(restProps, _excluded2);
     var findColumnItem = columns === null || columns === void 0 ? void 0 : columns.find(function (item) {
       return (item.dataIndex || item.key) === rest.dataIndex;
@@ -136,7 +139,9 @@ export function HeaderCell(props) {
     var ellipsis = findColumnItem ? findColumnItem.ellipsis && !findColumnItem.filters && !findColumnItem.sorter ? true : false : false;
     var renderChildren = ellipsis ? /*#__PURE__*/React.createElement(_TooltipText, null, _children) : _children;
     if (!width) {
-      return /*#__PURE__*/React.createElement("th", rest, renderChildren);
+      return /*#__PURE__*/React.createElement("th", _extends({}, rest, {
+        onClick: _onClick
+      }), renderChildren);
     }
     return /*#__PURE__*/React.createElement(Resizable, {
       width: width,
@@ -149,6 +154,7 @@ export function HeaderCell(props) {
         document.body.onselectstart = function () {
           return false;
         };
+        isResizeRef.current = true;
       },
       onResizeStop: function onResizeStop(e, data) {
         // 页面选中功能开启
@@ -157,12 +163,21 @@ export function HeaderCell(props) {
         };
         // 第三个参数是拖拽是否结束
         _onResize(e, data, true);
+        setTimeout(function () {
+          isResizeRef.current = false;
+        });
       },
       className: "cw-table-react-resizable",
       draggableOpts: {
         enableUserSelectHack: false
       }
-    }, /*#__PURE__*/React.createElement("th", rest, renderChildren));
+    }, /*#__PURE__*/React.createElement("th", _extends({}, rest, {
+      onClick: function onClick() {
+        if (!isResizeRef.current && _onClick) {
+          _onClick.apply(void 0, arguments);
+        }
+      }
+    }), renderChildren));
   };
   return /*#__PURE__*/React.createElement(SortContext.Consumer, null, render);
 }

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;