@chaoswise/ui 3.0.17 → 3.0.18

package/lib/CWMessage/MessageContent/TabList/index.js

@@ -10,7 +10,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 import React from 'react';
-import moment from 'moment';
+import dayjs from '../../../utils/generate/dayjs';
 import classnames from 'classnames';
 import { readInnerMessageApi } from '../../service';
 import { useIntl } from '../../../locales';
@@ -110,7 +110,7 @@ var TabList = function TabList(props) {
       className: "".concat(messagePrefixCls, "-content-tabs-list-desc")
     }, (_message$summary = message.summary) !== null && _message$summary !== void 0 ? _message$summary : ''), /*#__PURE__*/React.createElement("div", {
       className: "".concat(messagePrefixCls, "-content-tabs-list-date")
-    }, message.time ? moment(Number(message.time)).format('YYYY/MM/DD HH:mm:ss') : ''));
+    }, message.time ? dayjs(Number(message.time)).format('YYYY/MM/DD HH:mm:ss') : ''));
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     className: "".concat(messagePrefixCls, "-content-all-read"),

package/lib/CWRangePicker/DropdownMenu/index.js

@@ -29,7 +29,7 @@ import MoreSvg from "../assets/more";
 import MoreTimeList from "./MoreTimeList";
 import MoreHistoryList from "./MoreHistoryList";
 import useConfigContext from "../../useConfigContext";
-import { judgeType, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo } from "../utils";
+import { judgeType, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo } from "../utils/generate/dayjs";
 import { useIntl } from "../../locales";
 import useStyle from "./index.style";
 var DropdownMenu = function DropdownMenu(props) {
@@ -107,6 +107,7 @@ var DropdownMenu = function DropdownMenu(props) {
   // 点击切换为日历
   var onClickSelectCalendar = function onClickSelectCalendar(e) {
     e.nativeEvent.stopImmediatePropagation();
+    console.log(222, "22");
     setIsCalendar(true);
   };
   // 存在历史记录点击tag回显时间

package/lib/CWRangePicker/Refresh/index.js

@@ -20,7 +20,7 @@ import classnames from "classnames";
 import Refresh1Svg from "../assets/Refresh1";
 import Refresh2Svg from "../assets/Refresh2";
 import Refresh3Svg from "../assets/Refresh3";
-import { getChangeUnitDate, funcValueChangeArrayValue, getTimeSpanFromValue, computedRecentlyValue, judgeType } from "../utils";
+import { getChangeUnitDate, funcValueChangeArrayValue, getTimeSpanFromValue, computedRecentlyValue, judgeType } from "../utils/generate/dayjs";
 import useConfigContext from "../../useConfigContext";
 import { useIntl } from "../../locales";
 import useStyle from "./index.style";

package/lib/CWRangePicker/TimeSpan/index.js

@@ -8,7 +8,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
 import { CaretLeftOutlined, CaretRightOutlined, ZoomInOutlined } from "@ant-design/icons";
-import { getChangeDate } from "../utils";
+import { getChangeDate } from "../utils/generate/dayjs";
 import classnames from "classnames";
 import useConfigContext from "../../useConfigContext";
 import { useIntl } from "../../locales";

package/lib/CWRangePicker/index.js

@@ -1,9 +1,9 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import _Dropdown from "@chaoswise/ui/lib/Dropdown";
 import _Input from "@chaoswise/ui/lib/Input";
-import _message from "@chaoswise/ui/lib/message";
+import _RangePicker from "@chaoswise/ui/lib/RangePicker";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
-import _DatePicker from "@chaoswise/ui/lib/DatePicker";
+import _message2 from "@chaoswise/ui/lib/message";
 var _excluded = ["showTipIcon"],
   _excluded2 = ["timeDomain", "number", "unit", "isRecently", "value"],
   _excluded3 = ["value", "timeDomain", "number", "unit", "isRecently"];
@@ -36,13 +36,10 @@ import CalendarSvg from "./assets/Calendar";
 import LiveSvg from "./assets/live";
 import RecoverSvg from "./assets/Recover";
 import useConfigContext from "../useConfigContext";
-import { regroupDataSourceFn, echoInputValue, getUnit, judgeType, getChangeUnitDate, isInvalidDate, range, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo, getFinalDateOption, getTruthDateCount, isAfterDate, isSameDate, isExceedMaxTimeSpan, getYears, computedRecentlyValue } from "./utils";
+import dayjs, { regroupDataSourceFn, echoInputValue, getUnit, judgeType, getChangeUnitDate, isInvalidDate, range, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo, getFinalDateOption, getTruthDateCount, isAfterDate, isSameDate, isExceedMaxTimeSpan, getYears, computedRecentlyValue } from "./utils/generate/dayjs";
 import { isEqual } from "lodash-es";
-import moment from "moment";
 import { useIntl } from "../locales";
-import { formatMessage } from "../utils";
 import useStyle from "./index.style";
-var RangePicker = _DatePicker.RangePicker;
 var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue,
     value = props.value,
@@ -99,6 +96,10 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     dropdownCalendarClassName = menuOption.dropdownCalendarClassName,
     disabledDate = menuOption.disabledDate,
     disabledTime = menuOption.disabledTime;
+  var _message$useMessage = _message2.useMessage(),
+    _message$useMessage2 = _slicedToArray(_message$useMessage, 2),
+    message = _message$useMessage2[0],
+    contextHolder = _message$useMessage2[1];
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -155,6 +156,10 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var inputRef = useRef(null);
   // 含有刷新组件暴露的方法
   var refreshRef = useRef(null);
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    rangePickerValue = _useState16[0],
+    setRangePickerValue = _useState16[1];
   // 组件内部方法抛出
   useImperativeHandle(ref, function () {
     var _refreshRef$current;
@@ -210,13 +215,6 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var enableAutoRefresh = useMemo(function () {
     return openAutoRefresh !== undefined ? openAutoRefresh : isAutoRefresh;
   }, [openAutoRefresh, isAutoRefresh]);
-  useEffect(function () {
-    // antd5.0版本的RangePicker组件的open属性有问题这里做了处理
-    if (isCalendar && showCalendar) {
-      var calendarWrapperdom = calendarRef.current.querySelector(".cw-range-picker-calendar-wrapper");
-      calendarWrapperdom && calendarWrapperdom.click();
-    }
-  }, [isCalendar, showCalendar]);
   // 输入框回显
   useEffect(function () {
     setInputValue(echoInputValue(recordDateValue, isFocus, locale, format, forceRenderTitle, enableAutoRefresh, timeSpanBoundary));
@@ -333,7 +331,10 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     return function () {
       document.removeEventListener("click", clickBody);
     };
-  }, []);
+  }, [_defaultValue]);
+  useEffect(function () {
+    setRangePickerValue(_defaultValue);
+  }, [_defaultValue]);
   // 重组数据源
   var regroupDataSource = useMemo(function () {
     if (exceedShowInMore) {
@@ -348,6 +349,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     if (targetCalendar) {
       if (!targetCalendar.contains(e.target)) {
         setIsCalendar(false);
+        setRangePickerValue(_defaultValue);
       }
     }
     if (targetInput) {
@@ -444,7 +446,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       if (!isInvalidDate_) {
         var passValue = returnValue.value;
         if (isExceedMaxTimeSpan(passValue, timeSpanBoundary)) {
-          _message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
+          message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
           return;
         }
         _onChange(returnValue);
@@ -465,7 +467,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           setRecordDateValue(returnValue);
         }
       } else {
-        _message.error(intl.get("e2008629-6fc2-4222-b28c-ada43aa79a74").d("不符合输入格式,请重新输入"));
+        message.error(intl.get("e2008629-6fc2-4222-b28c-ada43aa79a74").d("不符合输入格式,请重新输入"));
       }
     } else {
       var finalDateOption = getFinalDateOption(inputValue);
@@ -477,7 +479,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         });
         var _passValue = _returnValue.value;
         if (isExceedMaxTimeSpan(_passValue, timeSpanBoundary)) {
-          _message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
+          message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
           return;
         }
         _onChange(_returnValue);
@@ -498,7 +500,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           setRecordDateValue(_returnValue);
         }
       } else {
-        _message.error(formatMessage(intl.get("e2008629-6fc2-4222-b28c-ada43aa79a74").d("不符合输入格式,请重新输入")));
+        message.error(intl.get("e2008629-6fc2-4222-b28c-ada43aa79a74").d("不符合输入格式,请重新输入"));
       }
     }
     isInputRef.current = false;
@@ -539,16 +541,16 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   return wrapCSSVar( /*#__PURE__*/React.createElement("div", {
     className: classnames(hashId, cssVarCls, "".concat(prefixCls, "-cw-range-picker-wrapper"), classNameWrapper),
     ref: calendarRef
-  }, /*#__PURE__*/React.createElement("div", {
+  }, contextHolder, /*#__PURE__*/React.createElement("div", {
     className: "cw-range-picker-box-wrapper"
-  }, isCalendar && showCalendar ? /*#__PURE__*/React.createElement(RangePicker
-  // open={isCalendar}
-  , {
+  }, isCalendar && showCalendar ? /*#__PURE__*/React.createElement(_RangePicker, {
+    open: isCalendar,
     className: classnames("cw-range-picker-calendar-wrapper"),
     getPopupContainer: function getPopupContainer(triggerNode) {
       return getPopupContainerCalendar ? getPopupContainerCalendar(triggerNode) : triggerNode;
     },
     dropdownClassName: classnames(dropdownCalendarClassName),
+    format: rangePickerFormat,
     allowClear: false,
     onChange: function onChange(_value, mode) {
       setIsCalendar(false);
@@ -557,19 +559,19 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         var _values2 = getCorrectValue({
           value: _value
         });
-        if (isAfterDate(_value[1], moment())) {
+        if (isAfterDate(_value[1], dayjs())) {
           _values2 = _objectSpread(_objectSpread({}, _values2), {}, {
-            value: [_value[0], moment()]
+            value: [_value[0], dayjs()]
           });
         }
         var _values3 = _values2,
           resValue = _values3.value;
         if (isSameDate(resValue[0], resValue[1], "second") || isAfterDate(resValue[0], resValue[1])) {
-          _message.error(intl.get("92eb0ee0-1f72-4f49-bfad-ff7f0d1bd21d").d("选择的时间二者相同或者某一时间超过当前时间，请重新选择"));
+          message.error(intl.get("92eb0ee0-1f72-4f49-bfad-ff7f0d1bd21d").d("选择的时间二者相同或者某一时间超过当前时间，请重新选择"));
           return;
         }
         if (isExceedMaxTimeSpan(resValue, timeSpanBoundary)) {
-          _message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
+          message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
           return;
         }
         _onChange(_values2);
@@ -591,17 +593,17 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     },
     disabledDate: disabledDate ? disabledDate : function (current) {
-      return current > moment().endOf("day");
+      return current > dayjs().endOf("day");
     },
     disabledTime: disabledTime ? disabledTime : function (date, position) {
       if (date) {
         var disabledTimeFunc = function disabledTimeFunc(date) {
-          var currentHours = moment().hours();
-          var currentMinutes = moment().minutes();
-          var currentSeconds = moment().seconds();
-          if (moment(date).date() === moment().date()) {
-            var isSameHour = moment(date).isSame(moment(), "hour"); // 是否是同一小时
-            var isSameMin = moment(date).isSame(moment(), "minute"); // 是否是同一分钟
+          var currentHours = dayjs().hour();
+          var currentMinutes = dayjs().minute();
+          var currentSeconds = dayjs().second();
+          if (dayjs(date).date() === dayjs().date()) {
+            var isSameHour = dayjs(date).isSame(dayjs(), "hour"); // 是否是同一小时
+            var isSameMin = dayjs(date).isSame(dayjs(), "minute"); // 是否是同一分钟
             // 如果是同一天
             return {
               disabledHours: function disabledHours() {
@@ -620,8 +622,36 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
             };
           }
         };
-        return disabledTimeFunc(date);
+        if (position === "start") {
+          if (date[0]) {
+            return disabledTimeFunc(date[0]);
+          }
+        }
+        if (position === "end") {
+          if (date[1]) {
+            return disabledTimeFunc(date[1]);
+          }
+        }
+      }
+    },
+    value: rangePickerValue // 默认为当前已经选择的时间
+    ,
+    onCalendarChange: function onCalendarChange(date, dataString, info) {
+      var _ref2 = date || [],
+        _ref3 = _slicedToArray(_ref2, 2),
+        date0 = _ref3[0],
+        date1 = _ref3[1];
+      var range = info.range;
+      if (range === "start" && date0) {
+        date0 = dayjs(date0).set("hour", 0).set("minute", 0).set("second", 0).set("millisecond", 0);
+      }
+      if (range === "end" && date1) {
+        date1 = dayjs(date1).set("hour", 23).set("minute", 59).set("second", 59).set("millisecond", 0);
+        if (dayjs().isSame(date1, "day")) {
+          date1 = dayjs();
+        }
       }
+      setRangePickerValue([date0, date1]);
     },
     showTime: {
       hideDisabledOptions: true