@chaoswise/ui 2.3.18 → 2.4.0

package/lib/BasicLayout/index.js

@@ -26,6 +26,7 @@ import './index.less';
 import { eventManager } from '../utils';
 import useLocale from '../useLocale';
 import langConfig from './locale';
+import { formatMessage } from "../utils";
 import useConfigContext from '../useConfigContext';
 var Content = _Layout.Content,
   AntHeader = _Layout.Header;
@@ -126,8 +127,12 @@ var BasicLayout = function BasicLayout(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     enableResizable = _useState8[0],
     setEnableResizable = _useState8[1];
-  // TODO 优化代码！！！！
-  var defaultSiderWidth = locale === 'zh' ? siderWidth : siderWidth + 40;
+  var SIDER_WIDTH_MAP = {
+    'en_US': siderWidth + 40,
+    'en': siderWidth + 40 // 兼容老版本
+  };
+
+  var defaultSiderWidth = SIDER_WIDTH_MAP[locale] || siderWidth;
   var _useState9 = useState(defaultSiderWidth),
     _useState10 = _slicedToArray(_useState9, 2),
     _siderDragWidth = _useState10[0],
@@ -267,7 +272,7 @@ var BasicLayout = function BasicLayout(_ref) {
     topNavigationClassName: topNavigationClassName,
     topNavigationTrigger: topNavigationTrigger,
     onClickTopNavigation: onClickTopNavigation,
-    allProductsTitle: allProductsTitle || langObj.allProductsTitle,
+    allProductsTitle: allProductsTitle || formatMessage(langObj["allProductsTitle"]),
     localeSwitcherOption: localeSwitcherOption,
     messageOption: messageOption,
     documentOption: documentOption,

package/lib/BasicLayout/locale/index.js

@@ -1,6 +1,11 @@
-import zhCN from './zh_CN.js';
-import enUS from './en_US.js';
+import zh_CN from './zh_CN.js';
+import en_US from './en_US.js';
+import zh_TW from './zh_TW.js';
 export default {
-  zh: zhCN,
-  en: enUS
+  zh_CN: zh_CN,
+  en_US: en_US,
+  zh_TW: zh_TW,
+  // 兼容
+  zh: zh_CN,
+  en: en_US
 };

package/lib/BasicLayout/locale/zh_TW.js

@@ -0,0 +1,4 @@
+export default {
+  back: '返回',
+  allProductsTitle: '所有產品'
+};

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

@@ -1,7 +1,7 @@
 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 "@chaoswise/ui/lib/Button/index.less";
 import _Button from "@chaoswise/ui/lib/Button";
-import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
+import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -10,18 +10,11 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-/*
- * @Author: andrew.qiao andrew.qiao@cloudwise.com
- * @Date: 2022-05-20 07:58:37
- * @LastEditors: andrew.qiao andrew.qiao@cloudwise.com
- * @LastEditTime: 2023-05-14 20:53:06
- * @FilePath: /change_01/aops_web_commons/packages/ui/components/CWMessage/MessageContent/TabList/index.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import React from "react";
 import moment from "moment";
 import { readInnerMessageApi } from "../../service";
-import { getLocale } from "../../locale";
+import langConfig from '../../locale';
+import { formatMessage } from "../../../utils";
 import "./index.less";
 var TabList = function TabList(props) {
   var _props$messages = props.messages,
@@ -37,10 +30,8 @@ var TabList = function TabList(props) {
     requestOption = props.requestOption,
     code = props.code,
     onTabListAllRead = props.onTabListAllRead;
-  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-  var localeObj = getLocale(locale);
+  var _useLocale = _useLocale2(langConfig),
+    localeObj = _useLocale.langObj;
   var _readInnerMessageApi = requestOption.readInnerMessageApi;
   var onHandleMessage = function onHandleMessage(message) {
     var userMessageId = message.userMessageId,
@@ -121,6 +112,6 @@ var TabList = function TabList(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     className: "cw-message-content-all-read",
     onClick: onHandleReadAllMessage
-  }, localeObj["markAllRead"]), messageList);
+  }, formatMessage(localeObj["markAllRead"])), messageList);
 };
 export default TabList;

package/lib/CWMessage/MessageContent/index.js

@@ -7,7 +7,7 @@ import _Empty from "@chaoswise/ui/lib/Empty";
 import _Spin from "@chaoswise/ui/lib/Antd/Spin";
 import "@chaoswise/ui/lib/Badge/index.less";
 import _Badge from "@chaoswise/ui/lib/Badge";
-import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
+import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 import "@chaoswise/ui/lib/Tabs/index.less";
 import _Tabs from "@chaoswise/ui/lib/Tabs";
 import _ThemeProvider from "@chaoswise/ui/lib/ThemeProvider";
@@ -30,6 +30,8 @@ import React, { useState, useEffect, useRef } from "react";
 import { getMessageTypeApi, getMessageListApi, getMessageUnreadCountApi } from "../service";
 import TabList from "./TabList";
 import { useHistory } from "react-router-dom";
+import langConfig from "../locale";
+import { formatMessage } from "../../utils";
 import "./index.less";
 var useThemeSwitcher = _ThemeProvider.useThemeSwitcher;
 var TabPane = _Tabs.TabPane;
@@ -101,10 +103,10 @@ var MessageContent = function MessageContent(props) {
       }, _callee);
     }))();
   }, []);
-  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-
+  var _useLocale = _useLocale2(langConfig),
+    localeObj = _useLocale.langObj,
+    _useLocale$locale = _useLocale.locale,
+    locale = _useLocale$locale === void 0 ? "zh_CN" : _useLocale$locale;
   // 查询消息列表(接口)
   var getMessageList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
@@ -208,7 +210,7 @@ var MessageContent = function MessageContent(props) {
       total: total
     };
   };
-  var emptyDescription = locale == "zh" ? "暂无新消息" : "No new messages";
+  var emptyDescription = formatMessage(localeObj["no_new_messages"]);
   return /*#__PURE__*/React.createElement("div", {
     className: "cw-message-content"
   }, tabOption.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Tabs, {
@@ -216,8 +218,8 @@ var MessageContent = function MessageContent(props) {
     className: "cw-message-content-tabs",
     animated: false
   }, tabOption.map(function (item) {
-    var tabName = locale == "zh" ? item.name : item.enName;
-    var moreTitle = locale == "zh" ? "更多" : "More";
+    var tabName = item.name;
+    var moreTitle = formatMessage(localeObj["more"]);
     return /*#__PURE__*/React.createElement(TabPane, {
       tab: unreadTypeArr.includes(item.code) ? /*#__PURE__*/React.createElement(_Badge, {
         color: themeVars["red-5"]
@@ -255,7 +257,9 @@ var MessageContent = function MessageContent(props) {
     })));
   })), total == 0 || hideOnSinglePage && total <= pageInfo.pageSize ? null : /*#__PURE__*/React.createElement("div", {
     className: "cw-message-pagination-wrapper"
-  }, /*#__PURE__*/React.createElement("span", null, locale === "zh" ? "\u5171".concat(total, "\u6761") : "".concat(total, " total")), /*#__PURE__*/React.createElement(_Pagination, _extends({
+  }, /*#__PURE__*/React.createElement("span", null, formatMessage(localeObj["totalItems"], {
+    total: total
+  })), /*#__PURE__*/React.createElement(_Pagination, _extends({
     simple: true
   }, getPaginationOption())))) : /*#__PURE__*/React.createElement(_Empty, {
     description: emptyDescription

package/lib/CWMessage/locale/en_US.js

@@ -1,3 +1,6 @@
 export default {
-  "markAllRead": "Mark all read"
+  "markAllRead": "Mark all read",
+  "no_new_messages": "No new messages",
+  "more": "More",
+  "totalItems": "{total} total"
 };

package/lib/CWMessage/locale/index.js

@@ -1,12 +1,11 @@
-import zhCN from './zh_CN.js';
-import enUS from './en_US.js';
-export var getLocale = function getLocale(locale) {
-  switch (locale) {
-    case 'zh':
-      return zhCN;
-    case 'en':
-      return enUS;
-    default:
-      return zhCN;
-  }
+import zh_CN from './zh_CN.js';
+import en_US from './en_US.js';
+import zh_TW from './zh_TW.js';
+export default {
+  zh_CN: zh_CN,
+  en_US: en_US,
+  zh_TW: zh_TW,
+  // 兼容
+  zh: zh_CN,
+  en: en_US
 };

package/lib/CWMessage/locale/zh_CN.js

@@ -1,3 +1,6 @@
 export default {
-  "markAllRead": "全部已读"
+  "markAllRead": "全部已读",
+  "no_new_messages": "暂无新消息",
+  "more": "更多",
+  "totalItems": "共{total}条"
 };

package/lib/CWMessage/locale/zh_TW.js

@@ -0,0 +1,6 @@
+export default {
+  "markAllRead": "全部已讀",
+  "no_new_messages": "暫無新消息",
+  "more": "更多",
+  "totalItems": "共{total}條"
+};

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

@@ -1,24 +1,23 @@
 import "@chaoswise/ui/lib/Tag/index.less";
 import _Tag from "@chaoswise/ui/lib/Tag";
 import _Icon from "@chaoswise/ui/lib/Antd/Icon";
-import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
+import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 import React from "react";
-import { getLocale } from "../../locale";
+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 _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-  var localeObj = getLocale(locale);
+  var _useLocale = _useLocale2(langConfig),
+    localeObj = _useLocale.langObj;
   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, localeObj["history"]), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, formatMessage(localeObj["history"])), /*#__PURE__*/React.createElement("div", {
     onClick: onCloseAllTag
   }, /*#__PURE__*/React.createElement(_Icon, {
     type: "delete"
@@ -26,7 +25,7 @@ export default function MoreHistoryList(props) {
     style: {
       marginLeft: "4px"
     }
-  }, localeObj["clear"]))), /*#__PURE__*/React.createElement("div", {
+  }, formatMessage(localeObj["clear"])))), /*#__PURE__*/React.createElement("div", {
     className: "cw-dropdown-menu-history-popup-more-content"
   }, historyList.map(function (tag) {
     return /*#__PURE__*/React.createElement(_Tag, {

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

@@ -2,27 +2,18 @@ import _Row from "@chaoswise/ui/lib/Antd/Row";
 import _Col from "@chaoswise/ui/lib/Antd/Col";
 import "@chaoswise/ui/lib/TooltipText/index.less";
 import _TooltipText from "@chaoswise/ui/lib/TooltipText";
-import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
-/*
- * @Author: andrew.qiao andrew.qiao@cloudwise.com
- * @Date: 2022-10-25 10:26:15
- * @LastEditors: andrew.qiao andrew.qiao@cloudwise.com
- * @LastEditTime: 2022-11-16 17:28:56
- * @FilePath: /change_01/aops_web_commons/packages/ui/components/CWRangePicker/DropdownMenu/MoreTimeList/index.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
+import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 import React from "react";
 import classnames from "classnames";
-import { getLocale } from "../../locale";
+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 _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-  var localeObj = getLocale(locale);
+  var _useLocale = _useLocale2(langConfig),
+    localeObj = _useLocale.langObj;
   // 点击Menu.Item中切换常规模式
   var onClickMoreItem = function onClickMoreItem(item) {
     onClickItem(item);
@@ -36,7 +27,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, localeObj[timeTypeItem.type]), /*#__PURE__*/React.createElement(_Row, null, timeTypeItem.timeList.map(function (item) {
+    }, /*#__PURE__*/React.createElement("h3", null, formatMessage(localeObj[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,7 @@ import "@chaoswise/ui/lib/Tag/index.less";
 import _Tag from "@chaoswise/ui/lib/Tag";
 import _Dropdown from "@chaoswise/ui/lib/Antd/Dropdown";
 import _Icon from "@chaoswise/ui/lib/Antd/Icon";
-import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
+import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 var _excluded = ["timeDomain", "number", "unit", "value", "isRecently"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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."); }
@@ -24,7 +24,6 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 import React from "react";
 import classnames from "classnames";
-import { getLocale } from "../locale";
 import CalendarSvg from "../assets/Calendar";
 import Calendar2Svg from "../assets/Calendar2";
 import LiveSvg from "../assets/live";
@@ -32,6 +31,8 @@ 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 "./index.less";
 var DropdownMenu = function DropdownMenu(props) {
   var dataSource = props.dataSource,
@@ -48,10 +49,10 @@ var DropdownMenu = function DropdownMenu(props) {
     setHistoryList = props.setHistoryList,
     format = props.format,
     timeSpanOption = props.timeSpanOption;
-  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-  var localeObj = getLocale(locale);
+  var _useLocale = _useLocale2(langConfig),
+    localeObj = _useLocale.langObj,
+    _useLocale$locale = _useLocale.locale,
+    locale = _useLocale$locale === void 0 ? "zh_CN" : _useLocale$locale;
   var _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
     timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
   var _menuOption$showCalen = menuOption.showCalendar,
@@ -181,7 +182,7 @@ var DropdownMenu = function DropdownMenu(props) {
     style: {
       marginLeft: "4px"
     }
-  }, localeObj.more)), /*#__PURE__*/React.createElement(_Icon, {
+  }, formatMessage(localeObj["more"]))), /*#__PURE__*/React.createElement(_Icon, {
     type: "right"
   }))), showCalendar && /*#__PURE__*/React.createElement("div", {
     className: classnames("cw-dropdown-menu-_item"),
@@ -195,7 +196,7 @@ var DropdownMenu = function DropdownMenu(props) {
     style: {
       marginLeft: "4px"
     }
-  }, localeObj["select-calendar"])), showHistoryList && Boolean(historyList.length) && /*#__PURE__*/React.createElement(_Dropdown, {
+  }, formatMessage(localeObj["select-calendar"]))), showHistoryList && Boolean(historyList.length) && /*#__PURE__*/React.createElement(_Dropdown, {
     overlay: /*#__PURE__*/React.createElement(MoreHistoryList, {
       historyList: historyList,
       onClickTag: onClickTag,
@@ -214,7 +215,7 @@ var DropdownMenu = function DropdownMenu(props) {
     className: classnames("cw-dropdown-menu-history-wrapper")
   }, /*#__PURE__*/React.createElement("span", {
     className: "cw-dropdown-menu-history-title"
-  }, localeObj["history"], ":"), historyList.slice(0, showDefaultHistoryCount).map(function (tag) {
+  }, formatMessage(localeObj["history"]), ":"), historyList.slice(0, showDefaultHistoryCount).map(function (tag) {
     return /*#__PURE__*/React.createElement(_Tag, {
       type: "custom_type01",
       closable: true,

package/lib/CWRangePicker/Refresh/index.js

@@ -3,7 +3,7 @@ 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 _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
+import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 var _excluded = ["value", "key"];
 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; }
@@ -24,7 +24,8 @@ import Refresh1Svg from "../assets/Refresh1";
 import Refresh2Svg from "../assets/Refresh2";
 import Refresh3Svg from "../assets/Refresh3";
 import { getChangeUnitDate, funcValueChangeArrayValue, getTimeSpanFromValue, computedRecentlyValue, judgeType } from "../utils";
-import { getLocale } from "../locale";
+import langConfig from "../locale";
+import { formatMessage } from "../../utils";
 import "./index.less";
 var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
   var recordDateValue = props.recordDateValue,
@@ -51,10 +52,8 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
     showRefresh = _refreshOption$showRe === void 0 ? true : _refreshOption$showRe;
   var _timeSpanOption$timeS = timeSpanOption.timeSpanBoundary,
     timeSpanBoundary = _timeSpanOption$timeS === void 0 ? 94608000 : _timeSpanOption$timeS;
-  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-  var localeObj = getLocale(locale);
+  var _useLocale = _useLocale2(langConfig),
+    localeObj = _useLocale.langObj;
   // 手动刷新
   var onRefresh = function onRefresh() {
     var values = recordDateValue.value;
@@ -143,12 +142,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: localeObj["refresh"]
+    title: formatMessage(localeObj["refresh"])
   }, /*#__PURE__*/React.createElement(_Button, {
     onClick: onRefresh,
     disabled: isDisabledRefresh
   }, /*#__PURE__*/React.createElement(Refresh1Svg, null))), showAutoRefresh && /*#__PURE__*/React.createElement(_Tooltip, {
-    title: localeObj["autoRefresh"]
+    title: formatMessage(localeObj["autoRefresh"])
   }, /*#__PURE__*/React.createElement(_Button, {
     onClick: onAutoRefresh,
     disabled: isDisabledAutoRefresh,

package/lib/CWRangePicker/TimeSpan/index.js

@@ -1,19 +1,12 @@
 import "@chaoswise/ui/lib/Tooltip/index.less";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
-import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
+import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 import "@chaoswise/ui/lib/Button/index.less";
 import _Button from "@chaoswise/ui/lib/Button";
-/*
- * @Author: andrew.qiao andrew.qiao@cloudwise.com
- * @Date: 2022-08-11 18:23:40
- * @LastEditors: andrew.qiao andrew.qiao@cloudwise.com
- * @LastEditTime: 2023-03-28 10:39:35
- * @FilePath: /change_01/aops_web_commons/packages/ui/components/CWRangePicker/TimeSpan/index.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import React from "react";
 import { getChangeDate } from "../utils";
-import { getLocale } from "../locale";
+import langConfig from "../locale";
+import { formatMessage } from "../../utils";
 import "./index.less";
 _Button.__ANT_BUTTON = true;
 var TimeSpan = function TimeSpan(props) {
@@ -26,10 +19,8 @@ var TimeSpan = function TimeSpan(props) {
     timeSpanOption = props.timeSpanOption,
     isRightDisabled = props.isRightDisabled,
     isDisabledEnlargeBtn = props.isDisabledEnlargeBtn;
-  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-  var localeObj = getLocale(locale);
+  var _useLocale = _useLocale2(langConfig),
+    localeObj = _useLocale.langObj;
   var _timeSpanOption$showF = timeSpanOption.showForwardBtn,
     showForwardBtn = _timeSpanOption$showF === void 0 ? true : _timeSpanOption$showF,
     _timeSpanOption$showB = timeSpanOption.showBackwardBtn,
@@ -46,11 +37,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 ? localeObj["forwardSmooth"] : _tooltipTitleCustom$f,
+    forwardTitle = _tooltipTitleCustom$f === void 0 ? formatMessage(localeObj["forwardSmooth"]) : _tooltipTitleCustom$f,
     _tooltipTitleCustom$b = tooltipTitleCustom.backTitle,
-    backTitle = _tooltipTitleCustom$b === void 0 ? localeObj["backSmooth"] : _tooltipTitleCustom$b,
+    backTitle = _tooltipTitleCustom$b === void 0 ? formatMessage(localeObj["backSmooth"]) : _tooltipTitleCustom$b,
     _tooltipTitleCustom$e = tooltipTitleCustom.expandTitle,
-    expandTitle = _tooltipTitleCustom$e === void 0 ? localeObj["ExpandSpan"].replace('{span}', "".concat(growSize)) : _tooltipTitleCustom$e;
+    expandTitle = _tooltipTitleCustom$e === void 0 ? formatMessage(localeObj["ExpandSpan"], {
+      span: "".concat(growSize)
+    }) : _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,7 @@ 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/Antd/Icon";
-import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
+import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 var _excluded = ["showTipIcon"],
   _excluded2 = ["timeDomain", "number", "unit", "isRecently", "value"],
   _excluded3 = ["value", "timeDomain", "number", "unit", "isRecently"];
@@ -34,7 +34,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { forwardRef, useState, useEffect, useMemo, useRef, useImperativeHandle } from "react";
 import PropTypes from "prop-types";
 import classnames from "classnames";
-import { getLocale } from "./locale";
 import DropDownMenu from "./DropdownMenu";
 import TimeSpan from "./TimeSpan";
 import Refresh from "./Refresh";
@@ -44,6 +43,8 @@ import RecoverSvg from "./assets/Recover";
 import { regroupDataSourceFn, echoInputValue, getUnit, judgeType, getChangeUnitDate, isInvalidDate, range, funcValueChangeArrayValue, getCorrectValue, getHistoryInfo, getFinalDateOption, getTruthDateCount, isAfterDate, isSameDate, isExceedMaxTimeSpan, getYears, computedRecentlyValue } from "./utils";
 import _ from "lodash";
 import moment from "moment";
+import langConfig from "./locale";
+import { formatMessage } from '../utils';
 import "./index.less";
 var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue,
@@ -72,10 +73,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 _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-  var localeObj = getLocale(locale);
+  var _useLocale = _useLocale2(langConfig),
+    localeObj = _useLocale.langObj,
+    _useLocale$locale = _useLocale.locale,
+    locale = _useLocale$locale === void 0 ? "zh_CN" : _useLocale$locale;
   var _refreshOption$onAuto = refreshOption.onAutoRefresh,
     onAutoRefresh = _refreshOption$onAuto === void 0 ? function () {} : _refreshOption$onAuto,
     _refreshOption$onAuto2 = refreshOption.onAutoRefreshChange,
@@ -395,7 +396,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     type: "question-circle",
     className: classnames("cw-range-picker-suffix-tips")
   })) : !isFocus && !_.isEqual(dateValueRest, rest) ? /*#__PURE__*/React.createElement(_Tooltip, {
-    title: localeObj.recover
+    title: formatMessage(localeObj["recover"])
   }, /*#__PURE__*/React.createElement(RecoverSvg, {
     onClick: onRecover,
     className: classnames("cw-range-picker-suffix-recover")
@@ -440,12 +441,15 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         // message.success(localeObj["fit-the-input-format"]);
         var passValue = returnValue.value;
         if (isExceedMaxTimeSpan(passValue, timeSpanBoundary)) {
-          _message.error(localeObj["the-maximum-time-span-is-exceeded"]);
+          _message.error(formatMessage(localeObj["the-maximum-time-span-is-exceeded"]));
           return;
         }
         _onChange(returnValue);
         setIsFocus(false);
-        var _getHistoryInfo = getHistoryInfo(returnValue, historyList, locale, format, timeSpanBoundary),
+        var _getHistoryInfo = getHistoryInfo(returnValue, historyList, {
+            localeObj: localeObj,
+            locale: locale
+          }, format, timeSpanBoundary),
           _getHistoryInfo2 = _slicedToArray(_getHistoryInfo, 2),
           isRepeat = _getHistoryInfo2[0],
           historyValue = _getHistoryInfo2[1];
@@ -458,7 +462,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           setRecordDateValue(returnValue);
         }
       } else {
-        _message.error(localeObj["does-not-match-the-input-format"]);
+        _message.error(formatMessage(localeObj["does-not-match-the-input-format"]));
       }
     } else {
       var finalDateOption = getFinalDateOption(inputValue);
@@ -470,12 +474,15 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         });
         var _passValue = _returnValue.value;
         if (isExceedMaxTimeSpan(_passValue, timeSpanBoundary)) {
-          _message.error(localeObj["the-maximum-time-span-is-exceeded"]);
+          _message.error(formatMessage(localeObj["the-maximum-time-span-is-exceeded"]));
           return;
         }
         _onChange(_returnValue);
         setIsFocus(false);
-        var _getHistoryInfo3 = getHistoryInfo(_returnValue, historyList, locale, format, timeSpanBoundary),
+        var _getHistoryInfo3 = getHistoryInfo(_returnValue, historyList, {
+            localeObj: localeObj,
+            locale: locale
+          }, format, timeSpanBoundary),
           _getHistoryInfo4 = _slicedToArray(_getHistoryInfo3, 2),
           _isRepeat = _getHistoryInfo4[0],
           _historyValue = _getHistoryInfo4[1];
@@ -488,7 +495,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           setRecordDateValue(_returnValue);
         }
       } else {
-        _message.error(localeObj["does-not-match-the-input-format"]);
+        _message.error(formatMessage(localeObj["does-not-match-the-input-format"]));
       }
     }
     isInputRef.current = false;
@@ -555,15 +562,18 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         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"]);
+          _message.error(formatMessage(localeObj["the-selected-time-does-not-meet-the-rule-limit"]));
           return;
         }
         if (isExceedMaxTimeSpan(resValue, timeSpanBoundary)) {
-          _message.error(localeObj["the-maximum-time-span-is-exceeded"]);
+          _message.error(formatMessage(localeObj["the-maximum-time-span-is-exceeded"]));
           return;
         }
         _onChange(_values2);
-        var _getHistoryInfo5 = getHistoryInfo(_values2, historyList, locale, format, timeSpanBoundary),
+        var _getHistoryInfo5 = getHistoryInfo(_values2, historyList, {
+            localeObj: localeObj,
+            locale: locale
+          }, format, timeSpanBoundary),
           _getHistoryInfo6 = _slicedToArray(_getHistoryInfo5, 2),
           isRepeat = _getHistoryInfo6[0],
           historyValue = _getHistoryInfo6[1];