@chaoswise/ui 2.7.11 → 2.8.0

package/lib/CWMessage/service/index.js

@@ -1,35 +1,35 @@
 import { fetchGet, fetchPost } from "../utils";
 
 // 用户登录预处理接口
-export var getSessionId = function getSessionId(gateway) {
-  return fetchGet("".concat(gateway, "/message/api/v1/tool/getSessionId"));
+export var getSessionId = function getSessionId(gateway, locale) {
+  return fetchGet("".concat(gateway, "/message/api/v1/tool/getSessionId"), undefined, locale);
 };
 
 // 查询权限对应的tab栏信息
-export var getMessageTypeApi = function getMessageTypeApi(gateway) {
-  return fetchGet("".concat(gateway, "/message/api/v1/messageType/list"));
+export var getMessageTypeApi = function getMessageTypeApi(gateway, locale) {
+  return fetchGet("".concat(gateway, "/message/api/v1/messageType/list"), undefined, locale);
 };
 
 // 查询消息列表
-export var getMessageListApi = function getMessageListApi(params, gateway) {
-  return fetchGet("".concat(gateway, "/message/api/v1/innerMessage/page"), params);
+export var getMessageListApi = function getMessageListApi(params, gateway, locale) {
+  return fetchGet("".concat(gateway, "/message/api/v1/innerMessage/page"), params, locale);
 };
 
 // 已读指定信息
-export var readInnerMessageApi = function readInnerMessageApi(params, gateway) {
-  return fetchPost("".concat(gateway, "/message/api/v1/innerMessage/read"), params);
+export var readInnerMessageApi = function readInnerMessageApi(params, gateway, locale) {
+  return fetchPost("".concat(gateway, "/message/api/v1/innerMessage/read"), params, locale);
 };
 
 // 查询所有类型的未读信息
-export var getMessageUnreadCountApi = function getMessageUnreadCountApi(gateway) {
-  return fetchGet("".concat(gateway, "/message/api/v1/innerMessage/unreadCount"));
+export var getMessageUnreadCountApi = function getMessageUnreadCountApi(gateway, locale) {
+  return fetchGet("".concat(gateway, "/message/api/v1/innerMessage/unreadCount"), undefined, locale);
 };
 
 // 查询消息详情
-export var getMessageDetailApi = function getMessageDetailApi(params, gateway) {
-  return fetchGet("".concat(gateway, "/message/api/v1/innerMessage/getDetail"), params);
+export var getMessageDetailApi = function getMessageDetailApi(params, gateway, locale) {
+  return fetchGet("".concat(gateway, "/message/api/v1/innerMessage/getDetail"), params, locale);
 };
 // 查询强提醒配置
-export var getMessageQuerySettingsApi = function getMessageQuerySettingsApi(gateway) {
-  return fetchGet("".concat(gateway, "/message/api/v1/notice/querySettings"));
+export var getMessageQuerySettingsApi = function getMessageQuerySettingsApi(gateway, locale) {
+  return fetchGet("".concat(gateway, "/message/api/v1/notice/querySettings"), undefined, locale);
 };

package/lib/CWMessage/utils/index.js

@@ -1,12 +1,19 @@
-var _window$localStorage$;
-var headers = {
-  withCredentials: true,
-  userId: window.localStorage.getItem("accountUserId") || "2",
-  accountId: window.localStorage.getItem("accountId") || "110",
-  "Content-Type": "application/json",
-  language: (_window$localStorage$ = window.localStorage.getItem("language")) !== null && _window$localStorage$ !== void 0 && _window$localStorage$.includes("en") ? "en_US" : "zh_CN"
+import { normalizeLocale } from '../../locales/runtime';
+
+// Forward the current language using company locale codes, without reducing it
+// to Chinese/English. Provider callers take precedence over fresh host storage.
+var getHeaders = function getHeaders(locale) {
+  var storage = typeof window === 'undefined' ? null : window.localStorage;
+  var language = locale !== undefined ? locale : storage === null || storage === void 0 ? void 0 : storage.getItem('language');
+  return {
+    withCredentials: true,
+    userId: (storage === null || storage === void 0 ? void 0 : storage.getItem('accountUserId')) || '2',
+    accountId: (storage === null || storage === void 0 ? void 0 : storage.getItem('accountId')) || '110',
+    'Content-Type': 'application/json',
+    language: normalizeLocale(language || 'zh_CN')
+  };
 };
-export var fetchGet = function fetchGet(url, params) {
+export var fetchGet = function fetchGet(url, params, locale) {
   var str = "";
   if (params) {
     var arr = [];
@@ -17,16 +24,16 @@ export var fetchGet = function fetchGet(url, params) {
   }
   return fetch(url + "?" + str, {
     method: "GET",
-    headers: headers
+    headers: getHeaders(locale)
   }).then(function (response) {
     return response.json();
   });
 };
-export var fetchPost = function fetchPost(url, params) {
+export var fetchPost = function fetchPost(url, params, locale) {
   return fetch(url, {
     method: "POST",
     body: JSON.stringify(params),
-    headers: headers
+    headers: getHeaders(locale)
   }).then(function (response) {
     return response.json();
   });

package/lib/CWRangePicker/DropdownMenu/MoreHistoryList/index.js

@@ -1,23 +1,26 @@
 import "@chaoswise/ui/lib/Tag/index.less";
 import _Tag from "@chaoswise/ui/lib/Tag";
 import _Icon from "@chaoswise/ui/lib/Icon";
-import _useLocale2 from "@chaoswise/ui/lib/useLocale";
+import useIntl from '../../../useIntl';
+import useConfigLocale from '../../../ConfigProvider/useLocale';
+import { getHistoryTitle } from '../../utils';
 import React from "react";
-import langConfig from "../../locale";
-import { formatMessage } from "../../../utils";
 import "./index.less";
 export default function MoreHistoryList(props) {
   var historyList = props.historyList,
     onClickTag = props.onClickTag,
     onCloseTag = props.onCloseTag,
-    onCloseAllTag = props.onCloseAllTag;
-  var _useLocale = _useLocale2(langConfig),
-    localeObj = _useLocale.langObj;
+    onCloseAllTag = props.onCloseAllTag,
+    format = props.format,
+    timeSpanBoundary = props.timeSpanBoundary;
+  var intl = useIntl();
+  var _useConfigLocale = useConfigLocale(),
+    locale = _useConfigLocale.locale;
   return /*#__PURE__*/React.createElement("div", {
     className: "cw-dropdown-menu-history-popup-more-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
     className: "cw-dropdown-menu-history-popup-more-header"
-  }, /*#__PURE__*/React.createElement("span", null, formatMessage(localeObj["history"])), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, intl.get("294afc43-e2de-4d72-ba99-1f25d6f7a1d7").d("历史记录")), /*#__PURE__*/React.createElement("div", {
     onClick: onCloseAllTag
   }, /*#__PURE__*/React.createElement(_Icon, {
     type: "delete"
@@ -25,11 +28,11 @@ export default function MoreHistoryList(props) {
     style: {
       marginLeft: "4px"
     }
-  }, formatMessage(localeObj["clear"])))), /*#__PURE__*/React.createElement("div", {
+  }, intl.get("53e957d9-8aee-4322-a144-31d4cff11c9f").d("清空")))), /*#__PURE__*/React.createElement("div", {
     className: "cw-dropdown-menu-history-popup-more-content"
   }, historyList.map(function (tag) {
     return /*#__PURE__*/React.createElement(_Tag, {
-      key: tag.title,
+      key: tag.key,
       closable: true,
       onClose: function onClose(e) {
         return onCloseTag(e, tag);
@@ -39,6 +42,9 @@ export default function MoreHistoryList(props) {
       },
       type: "custom_type01",
       className: "cw-dropdown-menu-history-popup-more-content-tag-title"
-    }, tag.title);
+    }, getHistoryTitle(tag, {
+      locale: locale,
+      intl: intl
+    }, format, timeSpanBoundary));
   })));
 }

package/lib/CWRangePicker/DropdownMenu/MoreTimeList/index.js

@@ -2,18 +2,16 @@ import _Row from "@chaoswise/ui/lib/Row";
 import _Col from "@chaoswise/ui/lib/Col";
 import "@chaoswise/ui/lib/TooltipText/index.less";
 import _TooltipText from "@chaoswise/ui/lib/TooltipText";
-import _useLocale2 from "@chaoswise/ui/lib/useLocale";
+import useIntl from '../../../useIntl';
+import getTimeTypeLabel from '../../../locales/messages/timeTypes';
 import React from "react";
 import classnames from "classnames";
-import langConfig from "../../locale";
-import { formatMessage } from "../../../utils";
 import "./index.less";
 var MoreTimeList = function MoreTimeList(props) {
   var regroupDataSource = props.regroupDataSource,
     recordDateValue = props.recordDateValue,
     onClickItem = props.onClickItem;
-  var _useLocale = _useLocale2(langConfig),
-    localeObj = _useLocale.langObj;
+  var intl = useIntl();
   // 点击Menu.Item中切换常规模式
   var onClickMoreItem = function onClickMoreItem(item) {
     onClickItem(item);
@@ -27,7 +25,7 @@ var MoreTimeList = function MoreTimeList(props) {
         borderBottom: regroupDataSource.length - 1 !== index ? "1px solid rgba(0,0,0,0.06)" : ""
       },
       key: timeTypeItem.type
-    }, /*#__PURE__*/React.createElement("h3", null, formatMessage(localeObj[timeTypeItem.type])), /*#__PURE__*/React.createElement(_Row, null, timeTypeItem.timeList.map(function (item) {
+    }, /*#__PURE__*/React.createElement("h3", null, getTimeTypeLabel(intl, timeTypeItem.type)), /*#__PURE__*/React.createElement(_Row, null, timeTypeItem.timeList.map(function (item) {
       return /*#__PURE__*/React.createElement(_Col, {
         key: item.key,
         span: timeTypeItem.type === "absolute" || timeTypeItem.type == "unixTimestamp" ? 12 : 8,

package/lib/CWRangePicker/DropdownMenu/index.js

@@ -3,7 +3,6 @@ import "@chaoswise/ui/lib/Tag/index.less";
 import _Tag from "@chaoswise/ui/lib/Tag";
 import _Dropdown from "@chaoswise/ui/lib/Dropdown";
 import _Icon from "@chaoswise/ui/lib/Icon";
-import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 var _excluded = ["timeDomain", "number", "unit", "value", "isRecently"];
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -22,6 +21,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+import useIntl from '../../useIntl';
+import useConfigLocale from '../../ConfigProvider/useLocale';
 import React from "react";
 import classnames from "classnames";
 import CalendarSvg from "../assets/Calendar";
@@ -30,9 +31,7 @@ import LiveSvg from "../assets/live";
 import MoreSvg from "../assets/more";
 import MoreTimeList from "./MoreTimeList";
 import MoreHistoryList from "./MoreHistoryList";
-import { judgeType, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo } from "../utils";
-import langConfig from "../locale";
-import { formatMessage } from "../../utils";
+import { judgeType, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo, getHistoryTitle } from "../utils";
 import "./index.less";
 var DropdownMenu = function DropdownMenu(props) {
   var dataSource = props.dataSource,
@@ -49,10 +48,10 @@ var DropdownMenu = function DropdownMenu(props) {
     setHistoryList = props.setHistoryList,
     format = props.format,
     timeSpanOption = props.timeSpanOption;
-  var _useLocale = _useLocale2(langConfig),
-    localeObj = _useLocale.langObj,
-    _useLocale$locale = _useLocale.locale,
-    locale = _useLocale$locale === void 0 ? "zh_CN" : _useLocale$locale;
+  var intl = useIntl();
+  var _useConfigLocale = useConfigLocale(),
+    _useConfigLocale$loca = _useConfigLocale.locale,
+    locale = _useConfigLocale$loca === void 0 ? "zh_CN" : _useConfigLocale$loca;
   var _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
     timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
   var _menuOption$showCalen = menuOption.showCalendar,
@@ -81,7 +80,10 @@ var DropdownMenu = function DropdownMenu(props) {
       });
       returnValue = getCorrectValue(returnValue, item.key);
       onChange(returnValue);
-      var _getHistoryInfo = getHistoryInfo(returnValue, historyList, locale, format, timeSpanBoundary),
+      var _getHistoryInfo = getHistoryInfo(returnValue, historyList, {
+          intl: intl,
+          locale: locale
+        }, format, timeSpanBoundary),
         _getHistoryInfo2 = _slicedToArray(_getHistoryInfo, 2),
         isRepeat = _getHistoryInfo2[0],
         historyValue = _getHistoryInfo2[1];
@@ -182,7 +184,7 @@ var DropdownMenu = function DropdownMenu(props) {
     style: {
       marginLeft: "4px"
     }
-  }, formatMessage(localeObj["more"]))), /*#__PURE__*/React.createElement(_Icon, {
+  }, intl.get("a30db643-5238-42bc-bc5e-98a9d0c7df51").d("更多"))), /*#__PURE__*/React.createElement(_Icon, {
     type: "right"
   }))), showCalendar && /*#__PURE__*/React.createElement("div", {
     className: classnames("cw-dropdown-menu-_item"),
@@ -196,9 +198,11 @@ var DropdownMenu = function DropdownMenu(props) {
     style: {
       marginLeft: "4px"
     }
-  }, formatMessage(localeObj["select-calendar"]))), showHistoryList && Boolean(historyList.length) && /*#__PURE__*/React.createElement(_Dropdown, {
+  }, intl.get("02fc19b1-7fc7-4859-b2e0-a65ac2039828").d("日历选择"))), showHistoryList && Boolean(historyList.length) && /*#__PURE__*/React.createElement(_Dropdown, {
     overlay: /*#__PURE__*/React.createElement(MoreHistoryList, {
       historyList: historyList,
+      format: format,
+      timeSpanBoundary: timeSpanBoundary,
       onClickTag: onClickTag,
       onCloseTag: onCloseTag,
       onCloseAllTag: onCloseAllTag
@@ -215,7 +219,7 @@ var DropdownMenu = function DropdownMenu(props) {
     className: classnames("cw-dropdown-menu-history-wrapper")
   }, /*#__PURE__*/React.createElement("span", {
     className: "cw-dropdown-menu-history-title"
-  }, formatMessage(localeObj["history"]), ":"), historyList.slice(0, showDefaultHistoryCount).map(function (tag) {
+  }, intl.get("294afc43-e2de-4d72-ba99-1f25d6f7a1d7").d("历史记录"), ":"), historyList.slice(0, showDefaultHistoryCount).map(function (tag) {
     return /*#__PURE__*/React.createElement(_Tag, {
       type: "custom_type01",
       closable: true,
@@ -227,7 +231,10 @@ var DropdownMenu = function DropdownMenu(props) {
       onClose: function onClose(e) {
         return onCloseTag(e, tag);
       }
-    }, tag.title);
+    }, getHistoryTitle(tag, {
+      locale: locale,
+      intl: intl
+    }, format, timeSpanBoundary));
   }), historyList.length > showDefaultHistoryCount && /*#__PURE__*/React.createElement("span", {
     className: "cw-dropdown-menu-history-more-ellipsis"
   }, "...")), /*#__PURE__*/React.createElement(_Icon, {

package/lib/CWRangePicker/Refresh/index.js

@@ -3,7 +3,6 @@ import "@chaoswise/ui/lib/Tooltip/index.less";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import "@chaoswise/ui/lib/Button/index.less";
 import _Button from "@chaoswise/ui/lib/Button";
-import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 var _excluded = ["value", "key"];
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
@@ -18,14 +17,13 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import useIntl from '../../useIntl';
 import React, { forwardRef, useImperativeHandle } from "react";
 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 langConfig from "../locale";
-import { formatMessage } from "../../utils";
 import "./index.less";
 var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
   var recordDateValue = props.recordDateValue,
@@ -55,8 +53,7 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
     isSpecialRelativeTime = _refreshOption$isSpec === void 0 ? false : _refreshOption$isSpec;
   var _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
     timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
-  var _useLocale = _useLocale2(langConfig),
-    localeObj = _useLocale.langObj;
+  var intl = useIntl();
   // 手动刷新
   var onRefresh = function onRefresh() {
     var values = recordDateValue.value,
@@ -154,12 +151,12 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
   return (showRefresh || showAutoRefresh) && /*#__PURE__*/React.createElement(_Button.Group, {
     className: "cw-range-picker-refresh-wrapper"
   }, showRefresh && /*#__PURE__*/React.createElement(_Tooltip, {
-    title: formatMessage(localeObj["refresh"])
+    title: intl.get("1d0f3c0c-188f-4f83-bff0-2792dffcdc2d").d("刷新")
   }, /*#__PURE__*/React.createElement(_Button, {
     onClick: onRefresh,
     disabled: isDisabledRefresh
   }, /*#__PURE__*/React.createElement(Refresh1Svg, null))), showAutoRefresh && /*#__PURE__*/React.createElement(_Tooltip, {
-    title: formatMessage(localeObj["autoRefresh"])
+    title: intl.get("502d0d23-e942-4ecd-89e4-e85431a3098f").d("自动刷新")
   }, /*#__PURE__*/React.createElement(_Button, {
     onClick: onAutoRefresh,
     disabled: isDisabledAutoRefresh,

package/lib/CWRangePicker/TimeSpan/index.js

@@ -1,12 +1,10 @@
 import "@chaoswise/ui/lib/Tooltip/index.less";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
-import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 import "@chaoswise/ui/lib/Button/index.less";
 import _Button from "@chaoswise/ui/lib/Button";
+import useIntl from '../../useIntl';
 import React from "react";
 import { getChangeDate } from "../utils";
-import langConfig from "../locale";
-import { formatMessage } from "../../utils";
 import "./index.less";
 _Button.__ANT_BUTTON = true;
 var TimeSpan = function TimeSpan(props) {
@@ -19,8 +17,7 @@ var TimeSpan = function TimeSpan(props) {
     timeSpanOption = props.timeSpanOption,
     isRightDisabled = props.isRightDisabled,
     isDisabledEnlargeBtn = props.isDisabledEnlargeBtn;
-  var _useLocale = _useLocale2(langConfig),
-    localeObj = _useLocale.langObj;
+  var intl = useIntl();
   var _timeSpanOption$showF = timeSpanOption.showForwardBtn,
     showForwardBtn = _timeSpanOption$showF === void 0 ? true : _timeSpanOption$showF,
     _timeSpanOption$showB = timeSpanOption.showBackwardBtn,
@@ -43,13 +40,13 @@ var TimeSpan = function TimeSpan(props) {
     _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
     timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
   var _tooltipTitleCustom$f = tooltipTitleCustom.forwardTitle,
-    forwardTitle = _tooltipTitleCustom$f === void 0 ? formatMessage(localeObj["forwardSmooth"]) : _tooltipTitleCustom$f,
+    forwardTitle = _tooltipTitleCustom$f === void 0 ? intl.get("df9a3bfb-00df-44cd-9761-87dc21ffc0e8").d("向前平滑") : _tooltipTitleCustom$f,
     _tooltipTitleCustom$b = tooltipTitleCustom.backTitle,
-    backTitle = _tooltipTitleCustom$b === void 0 ? formatMessage(localeObj["backSmooth"]) : _tooltipTitleCustom$b,
+    backTitle = _tooltipTitleCustom$b === void 0 ? intl.get("cefeccff-2f9e-4b59-925c-af11c28aa8ed").d("向后平滑") : _tooltipTitleCustom$b,
     _tooltipTitleCustom$e = tooltipTitleCustom.expandTitle,
-    expandTitle = _tooltipTitleCustom$e === void 0 ? formatMessage(localeObj["ExpandSpan"], {
+    expandTitle = _tooltipTitleCustom$e === void 0 ? intl.get("56a89179-5086-4c43-8814-06eac1ba9983", {
       span: "".concat(growSize)
-    }) : _tooltipTitleCustom$e;
+    }).d("按{span}倍增加时间跨度") : _tooltipTitleCustom$e;
   var onChangeTimeSpan = function onChangeTimeSpan(direction) {
     var _getChangeDate = getChangeDate(recordDateValue, direction, growSize, timeSpanBoundary),
       value = _getChangeDate.value,

package/lib/CWRangePicker/index.js

@@ -9,7 +9,6 @@ import _message from "@chaoswise/ui/lib/message";
 import "@chaoswise/ui/lib/Tooltip/index.less";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _Icon from "@chaoswise/ui/lib/Icon";
-import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 var _excluded = ["showTipIcon"],
   _excluded2 = ["timeDomain", "number", "unit", "isRecently", "value"],
   _excluded3 = ["value", "timeDomain", "number", "unit", "isRecently"];
@@ -31,6 +30,8 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+import useIntl from '../useIntl';
+import useConfigLocale from '../ConfigProvider/useLocale';
 import React, { forwardRef, useState, useEffect, useMemo, useRef, useImperativeHandle } from "react";
 import PropTypes from "prop-types";
 import classnames from "classnames";
@@ -43,14 +44,13 @@ import RecoverSvg from "./assets/Recover";
 import { regroupDataSourceFn, echoInputValue, getUnit, judgeType, getChangeUnitDate, isInvalidDate, range, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo, getFinalDateOption, getTruthDateCount, isAfterDate, isSameDate, isExceedMaxTimeSpan, getYears, computedRecentlyValue, getTimeSpanFromValue } from "./utils";
 import { isEqual } from "lodash-es";
 import moment from "moment";
-import langConfig from "./locale";
-import { formatMessage } from "../utils";
 import "./index.less";
+var EMPTY_DATA_SOURCE = [];
 var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue,
     value = props.value,
     _props$dataSource = props.dataSource,
-    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
+    dataSource = _props$dataSource === void 0 ? EMPTY_DATA_SOURCE : _props$dataSource,
     classNameWrapper = props.classNameWrapper,
     _props$onChange = props.onChange,
     _onChange = _props$onChange === void 0 ? function () {} : _props$onChange,
@@ -74,10 +74,10 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     open = props.open,
     _props$rangePickerFor = props.rangePickerFormat,
     rangePickerFormat = _props$rangePickerFor === void 0 ? "YYYY/MM/DD" : _props$rangePickerFor;
-  var _useLocale = _useLocale2(langConfig),
-    localeObj = _useLocale.langObj,
-    _useLocale$locale = _useLocale.locale,
-    locale = _useLocale$locale === void 0 ? "zh_CN" : _useLocale$locale;
+  var intl = useIntl();
+  var _useConfigLocale = useConfigLocale(),
+    _useConfigLocale$loca = _useConfigLocale.locale,
+    locale = _useConfigLocale$loca === void 0 ? "zh_CN" : _useConfigLocale$loca;
   var _refreshOption$onAuto = refreshOption.onAutoRefresh,
     onAutoRefresh = _refreshOption$onAuto === void 0 ? function () {} : _refreshOption$onAuto,
     _refreshOption$onAuto2 = refreshOption.onAutoRefreshChange,
@@ -128,6 +128,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     recordDateValue = _useState6[0],
     setRecordDateValue = _useState6[1];
+  var inputSourceRef = useRef(recordDateValue);
   // 自动刷新状态是否开启
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -135,19 +136,19 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     setIsAutoRefresh = _useState8[1];
   // 日历选择器时间
   var _useState9 = useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    rangePickerValue = _useState10[0],
-    setRangePickerValue = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    rangePickerValue = _useState0[0],
+    setRangePickerValue = _useState0[1];
   // 是否切换到日历选择
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isCalendar = _useState12[0],
-    setIsCalendar = _useState12[1];
+  var _useState1 = useState(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    isCalendar = _useState10[0],
+    setIsCalendar = _useState10[1];
   // 历史记录列表存储
-  var _useState13 = useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    historyList = _useState14[0],
-    setHistoryList = _useState14[1];
+  var _useState11 = useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    historyList = _useState12[0],
+    setHistoryList = _useState12[1];
   // 特殊时间选择器外壳容器
   var calendarRef = useRef(null);
   // 定时器计数
@@ -263,8 +264,14 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
 
   // 输入框回显
   useEffect(function () {
-    setInputValue(customRenderTitle ? customRenderTitle(recordDateValue, isFocus) : echoInputValue(recordDateValue, isFocus, locale, format, forceRenderTitle, timeSpanBoundary, isSpecialRelativeTime, _defaultValue));
-  }, [recordDateValue, isFocus, locale, format, forceRenderTitle, _defaultValue]);
+    var sourceChanged = inputSourceRef.current !== recordDateValue;
+    inputSourceRef.current = recordDateValue;
+    if (sourceChanged) isInputRef.current = false;
+    // Localizing the committed value must not overwrite an unsubmitted draft.
+    // A new controlled/selected value still takes precedence over that draft.
+    if (isFocus && isInputRef.current && !sourceChanged) return;
+    setInputValue(customRenderTitle ? customRenderTitle(recordDateValue, isFocus) : echoInputValue(recordDateValue, isFocus, locale, format, forceRenderTitle, timeSpanBoundary, isSpecialRelativeTime, _defaultValue, intl));
+  }, [recordDateValue, isFocus, locale, format, forceRenderTitle, _defaultValue, customRenderTitle, intl]);
   useEffect(function () {
     var _judgeType5 = judgeType(recordDateValue),
       _judgeType6 = _slicedToArray(_judgeType5, 1),
@@ -429,7 +436,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     type: "question-circle",
     className: classnames("cw-range-picker-suffix-tips")
   })) : showRecoverIcon && !isFocus && !isEqualDateValue ? /*#__PURE__*/React.createElement(_Tooltip, {
-    title: formatMessage(localeObj["recover"])
+    title: intl.get("8aba20b3-9ee3-48b9-863c-224e6bdb4947").d("恢复默认值")
   }, /*#__PURE__*/React.createElement(RecoverSvg, {
     onClick: onRecover,
     className: classnames("cw-range-picker-suffix-recover")
@@ -471,16 +478,16 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       }, inputValue);
       var isInvalidDate_ = isInvalidDate(returnValue.value);
       if (!isInvalidDate_) {
-        // message.success(localeObj["fit-the-input-format"]);
+        // Input format validation succeeded.
         var passValue = returnValue.value;
         if (isExceedMaxTimeSpan(passValue, timeSpanBoundary)) {
-          _message.error(formatMessage(localeObj["the-maximum-time-span-is-exceeded"]));
+          _message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
           return;
         }
         _onChange(returnValue);
         setIsFocus(false);
         var _getHistoryInfo = getHistoryInfo(returnValue, historyList, {
-            localeObj: localeObj,
+            intl: intl,
             locale: locale
           }, format, timeSpanBoundary),
           _getHistoryInfo2 = _slicedToArray(_getHistoryInfo, 2),
@@ -495,7 +502,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           setRecordDateValue(returnValue);
         }
       } else {
-        _message.error(formatMessage(localeObj["does-not-match-the-input-format"]));
+        _message.error(intl.get("e2008629-6fc2-4222-b28c-ada43aa79a74").d("不符合输入格式,请重新输入"));
       }
     } else {
       var finalDateOption = getFinalDateOption(inputValue);
@@ -507,13 +514,13 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         });
         var _passValue = _returnValue.value;
         if (isExceedMaxTimeSpan(_passValue, timeSpanBoundary)) {
-          _message.error(formatMessage(localeObj["the-maximum-time-span-is-exceeded"]));
+          _message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
           return;
         }
         _onChange(_returnValue);
         setIsFocus(false);
         var _getHistoryInfo3 = getHistoryInfo(_returnValue, historyList, {
-            localeObj: localeObj,
+            intl: intl,
             locale: locale
           }, format, timeSpanBoundary),
           _getHistoryInfo4 = _slicedToArray(_getHistoryInfo3, 2),
@@ -528,7 +535,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           setRecordDateValue(_returnValue);
         }
       } else {
-        _message.error(formatMessage(localeObj["does-not-match-the-input-format"]));
+        _message.error(intl.get("e2008629-6fc2-4222-b28c-ada43aa79a74").d("不符合输入格式,请重新输入"));
       }
     }
     isInputRef.current = false;
@@ -596,16 +603,16 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         var _values2 = values,
           resValue = _values2.value;
         if (isSameDate(resValue[0], resValue[1], "second") || isAfterDate(resValue[0], resValue[1])) {
-          _message.error(formatMessage(localeObj["the-selected-time-does-not-meet-the-rule-limit"]));
+          _message.error(intl.get("92eb0ee0-1f72-4f49-bfad-ff7f0d1bd21d").d("选择的时间二者相同或者某一时间超过当前时间，请重新选择"));
           return;
         }
         if (isExceedMaxTimeSpan(resValue, timeSpanBoundary)) {
-          _message.error(formatMessage(localeObj["the-maximum-time-span-is-exceeded"]));
+          _message.error(intl.get("e8a046c4-4611-47b9-bef0-cb46de7dd733").d("超过了限制的最大时间跨度，请重新输入"));
           return;
         }
         _onChange(values);
         var _getHistoryInfo5 = getHistoryInfo(values, historyList, {
-            localeObj: localeObj,
+            intl: intl,
             locale: locale
           }, format, timeSpanBoundary),
           _getHistoryInfo6 = _slicedToArray(_getHistoryInfo5, 2),