@chaoswise/ui 2.7.12 → 2.8.0

package/lib/AlgorithmChart/common/chart.option.js

@@ -1,11 +1,13 @@
 import moment from "moment";
-var ChartOption = function ChartOption() {
+var ChartOption = function ChartOption(intl) {
+  var anomalyLabel = intl.get("b38ae1d1-4784-48d0-93bc-5114e5bab2db").d("异常检测点：");
+  var realValueLabel = intl.get("25fb8e48-65c5-43f7-a8bf-7709ff04d887").d("真实值");
   var sampling = 'lttb'; ////average,max,min,sum/折线图在数据量远大于像素点时候的降采样策略，开启后可以有效的优化图表的绘制效率，默认关闭，也就是全部绘制不过滤数据点。
   return {
     animation: true,
     title: {
       show: true,
-      text: '原始数据',
+      text: intl.get("ed0f81b8-b85f-423b-b12a-1aaf718402f6").d("原始数据"),
       textStyle: {
         fontFamily: "Helvetica",
         color: "rgba(0,0,0,0.85)",
@@ -19,7 +21,7 @@ var ChartOption = function ChartOption() {
       formatter: function formatter(params) {
         // console.log(params)
         var upDownLine = params.filter(function (i) {
-          return i.seriesName === '上下界阈值';
+          return i.seriesName === intl.get("38ca4b1d-225d-424d-bd15-b113389de185").d("上下界阈值");
         });
         var dom = (params || []).map(function (item, index) {
           var marker = item.marker,
@@ -181,7 +183,7 @@ var ChartOption = function ChartOption() {
     series: [{
       animation: true,
       animationThreshold: 10000,
-      name: '原始数据',
+      name: intl.get("ed0f81b8-b85f-423b-b12a-1aaf718402f6").d("原始数据"),
       type: 'line',
       // color: '#0066FF',
       symbol: 'circle',
@@ -235,7 +237,8 @@ var ChartOption = function ChartOption() {
               _data$coord = data.coord,
               coord = _data$coord === void 0 ? [] : _data$coord;
             // console.log(param);
-            return ["{con|\u5F02\u5E38\u68C0\u6D4B\u70B9\uFF1A}", "{con|".concat(moment(Number(coord[0]) || '').format('YYYY/MM/DD HH:mm:ss'), "}"), "{con|\u771F\u5B9E\u503C: ".concat(coord[1] + minValue || '', "}")].join('\n');
+            // Translate only plain labels; rich-text braces belong to ECharts, not ICU.
+            return ["{con|".concat(anomalyLabel, "}"), "{con|".concat(moment(Number(coord[0]) || '').format('YYYY/MM/DD HH:mm:ss'), "}"), "{con|".concat(realValueLabel, ": ").concat(coord[1] + minValue || '', "}")].join('\n');
           },
           rich: {
             con: {
@@ -257,7 +260,7 @@ var ChartOption = function ChartOption() {
       // sampling: sampling,
     }, {
       animation: true,
-      name: '预测基线',
+      name: intl.get("95b117bb-3f50-4fa0-84ca-2352cc16a353").d("预测基线"),
       type: 'line',
       // color: '#3FBF00',
       symbol: 'circle',
@@ -286,7 +289,7 @@ var ChartOption = function ChartOption() {
       }
     }, {
       animation: true,
-      name: '上界',
+      name: intl.get("24ce035b-1020-49f4-91c0-7d291b97cfb2").d("上界"),
       type: 'line',
       // color: '#00c9c3',
       showSymbol: false,
@@ -302,7 +305,7 @@ var ChartOption = function ChartOption() {
       // sampling: sampling
     }, {
       animation: true,
-      name: '下界',
+      name: intl.get("ecee07fd-fc13-403f-99f3-fe3756c71893").d("下界"),
       type: 'line',
       // color: '#17c9b9',
       showSymbol: false,
@@ -319,7 +322,7 @@ var ChartOption = function ChartOption() {
       // sampling: sampling
     }, {
       animation: true,
-      name: '预测上界',
+      name: intl.get("154fd914-1948-48bb-bd07-b953ae4e54f8").d("预测上界"),
       type: 'line',
       // color: '#43C914',
       showSymbol: false,
@@ -335,7 +338,7 @@ var ChartOption = function ChartOption() {
       // sampling: sampling
     }, {
       animation: true,
-      name: '预测下界',
+      name: intl.get("62138181-9a19-4726-b3ba-0290fd83b0a7").d("预测下界"),
       type: 'line',
       // color: '#43C914',
       showSymbol: false,
@@ -352,7 +355,7 @@ var ChartOption = function ChartOption() {
       // sampling: sampling
     }, {
       animation: true,
-      name: '基线',
+      name: intl.get("2dc543f6-e08c-4197-bff4-46ccdcfae4e7").d("基线"),
       type: 'line',
       // color: '#FA8C16',
       data: [],

package/lib/AlgorithmChart/index.js

@@ -1,6 +1,11 @@
+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 _EchartsLine from "@chaoswise/ui/lib/EchartsLine";
+import _useIntl from "@chaoswise/ui/lib/useIntl";
 var _excluded = ["data", "chartOption"];
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+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 React, { useMemo } from "react";
@@ -12,12 +17,19 @@ import yellow from "./common/images/yellow.svg";
 import green from "./common/images/green.svg";
 import lightGreen from "./common/images/lightGreen.svg";
 var AlgorithmChart = function AlgorithmChart(props) {
+  var intl = _useIntl();
   var _props$data = props.data,
     data = _props$data === void 0 ? {} : _props$data,
     chartOption = props.chartOption,
     rest = _objectWithoutProperties(props, _excluded);
   var _data = useMemo(function () {
-    var option = _option();
+    var option = _option(intl);
+    var labels = {
+      upperThreshold: intl.get("ca04a75e-c8d1-48a3-8620-ae7e1a53d32f").d("上阈值界限"),
+      lowerThreshold: intl.get("605a8e37-803b-4bdd-9cd4-3f81766c6f90").d("下阈值界限"),
+      fittedUpper: intl.get("c0209052-9ae9-4f22-9b2b-e81d4f8b1f62").d("拟合上界"),
+      fittedLower: intl.get("18d4e95e-aafa-4c2b-b68f-17b7e06a4ae3").d("拟合下界")
+    };
     var _data$title = data.title,
       title = _data$title === void 0 ? '' : _data$title,
       _data$seriesData = data.seriesData,
@@ -111,7 +123,7 @@ var AlgorithmChart = function AlgorithmChart(props) {
     /*****************添加的上下阈值界限*****************************/
     if (upperThreshold || [0, '0'].includes(upperThreshold)) {
       option.series[0].markLine.data[0] = {
-        name: '上阈值界限',
+        name: labels.upperThreshold,
         yAxis: upperThreshold,
         minValue: minValue,
         // type: "median",
@@ -122,7 +134,7 @@ var AlgorithmChart = function AlgorithmChart(props) {
     }
     if (lowerThreshold || [0, '0'].includes(lowerThreshold)) {
       option.series[0].markLine.data[1] = {
-        name: '下阈值界限',
+        name: labels.lowerThreshold,
         yAxis: lowerThreshold,
         minValue: minValue,
         // type: "median",
@@ -147,11 +159,11 @@ var AlgorithmChart = function AlgorithmChart(props) {
 
     /******检测的上下界，有无预测值，上下界名称不一样******/
     if (forecastUpper.length) {
-      option.series[2].name = '拟合上界';
+      option.series[2].name = labels.fittedUpper;
     }
     option.series[2].data = upper.length ? upper : fitUpper;
     if (forecastLower.length) {
-      option.series[3].name = '拟合下界';
+      option.series[3].name = labels.fittedLower;
     }
     option.series[3].data = lower.length ? lower : fitLower;
 
@@ -166,13 +178,13 @@ var AlgorithmChart = function AlgorithmChart(props) {
     if (!!processedData.length || !!seriesData.length) {
       //是否显示原始数据按钮
       legengData.push({
-        name: '原始数据',
+        name: option.series[0].name,
         icon: blue
       });
     }
     if (forecastBaseline.length) {
       legengData.push({
-        name: '预测基线',
+        name: option.series[1].name,
         icon: green
       });
     }
@@ -180,40 +192,40 @@ var AlgorithmChart = function AlgorithmChart(props) {
     if (forecastUpper.length) {
       if (!!upper.length || !!fitUpper.length) {
         legengData.push({
-          name: '拟合上界',
+          name: option.series[2].name,
           icon: lightBlue
         });
       }
       if (!!lower.length || !!fitLower.length) {
         legengData.push({
-          name: '拟合下界',
+          name: option.series[3].name,
           icon: lightBlue
         });
       }
       legengData.push({
-        name: '预测上界',
+        name: option.series[4].name,
         icon: lightGreen
       });
     } else if (!!upper.length || !!fitUpper.length) {
       legengData.push({
-        name: '上界',
+        name: option.series[2].name,
         icon: lightBlue
       });
     }
     if (forecastLower.length) {
       legengData.push({
-        name: '预测下界',
+        name: option.series[5].name,
         icon: lightGreen
       });
     } else if (!!lower.length || !!fitLower.length) {
       legengData.push({
-        name: '下界',
+        name: option.series[3].name,
         icon: lightBlue
       });
     }
     if (!!baseline.length || !!fitBaseline.length) {
       legengData.push({
-        name: '基线',
+        name: option.series[6].name,
         icon: yellow
       });
     }
@@ -221,27 +233,18 @@ var AlgorithmChart = function AlgorithmChart(props) {
     /******************* 动态加载图例 ********************/
 
     /**********************默认展示/隐藏哪几条线*************/
-    var legengSelected = {
-      '拟合上界': false,
-      '拟合下界': false,
-      '预测上界': false,
-      '预测下界': false,
-      '上界': !forecastUpper.length,
-      '下界': !forecastLower.length
-    };
+    var legengSelected = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, option.series[4].name, false), option.series[5].name, false), option.series[2].name, !forecastUpper.length), option.series[3].name, !forecastLower.length);
     /**********************默认展示/隐藏哪几条线*************/
 
     /*****************没有预测值时，默认隐藏基线***********/
     if (!forecastBaseline.length) {
-      legengSelected = Object.assign({}, legengSelected, {
-        '基线': false
-      });
+      legengSelected = Object.assign({}, legengSelected, _defineProperty({}, option.series[6].name, false));
     }
     /*****************没有预测值时，默认隐藏基线***********/
 
     option.legend.selected = legengSelected;
     return option;
-  }, [data]);
+  }, [data, intl]);
   return /*#__PURE__*/React.createElement(_EchartsLine, _extends({
     option: _data,
     isMergeOption: false

package/lib/Antd4Form/FormItem.js

@@ -70,7 +70,7 @@ function Item(_ref) {
   }, [name, children]);
   if (!name) {
     if (typeof children !== 'function') {
-      console.warn('不要使用Form.Item进行非表单组件布局, 布局参考 https://formilyjs.org/#/xbS7SW/rpi9iNs5sD');
+      console.warn('不要使用Form.Item进行非表单组件布局, 布局参考 https://formilyjs.org/#/xbS7SW/rpi9iNs5sD'); // cw-i18n-disable-line
     }
     return /*#__PURE__*/React.createElement(Fragment, null, renderChildren);
   }

package/lib/BasicLayout/Nav.js

@@ -1,6 +1,5 @@
+import useIntl from '../useIntl';
 import React from 'react';
-import useLocale from '../useLocale';
-import langConfig from './locale';
 function Nav(_ref) {
   var customContent = _ref.customContent,
     showBreadcrumb = _ref.showBreadcrumb,
@@ -10,8 +9,7 @@ function Nav(_ref) {
     _ref$onClickBack = _ref.onClickBack,
     onClickBack = _ref$onClickBack === void 0 ? function () {} : _ref$onClickBack,
     breadCrumb = _ref.breadCrumb;
-  var _useLocale = useLocale(langConfig),
-    langObj = _useLocale.langObj;
+  var intl = useIntl();
   if (customContent) {
     return null;
   }
@@ -29,7 +27,7 @@ function Nav(_ref) {
       className: "cw-content-nav-back-btn"
     }, backIcon), /*#__PURE__*/React.createElement("div", {
       className: "cw-content-nav-back-title"
-    }, backNavigationTitle || langObj.back))));
+    }, backNavigationTitle || intl.get("26935dff-3710-42be-bf75-175785ea86a1").d("返回")))));
   }
   if (showBreadcrumb) {
     return /*#__PURE__*/React.createElement("div", {

package/lib/BasicLayout/index.js

@@ -13,6 +13,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, { useState, useEffect, useRef } from "react";
 import ReactDOM from "react-dom";
 import PropTypes from 'prop-types';
@@ -23,9 +25,6 @@ import Sider from './Sider';
 import Nav from './Nav';
 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;
@@ -99,9 +98,9 @@ var BasicLayout = function BasicLayout(_ref) {
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls('basic-layout');
-  var _useLocale = useLocale(langConfig),
-    langObj = _useLocale.langObj,
-    locale = _useLocale.locale;
+  var intl = useIntl();
+  var _useConfigLocale = useConfigLocale(),
+    locale = _useConfigLocale.locale;
   var menuData = menuOptions.menuData,
     _menuOptions$resizabl = menuOptions.resizableProps,
     _menuOptions$resizabl2 = _menuOptions$resizabl === void 0 ? {} : _menuOptions$resizabl,
@@ -270,7 +269,7 @@ var BasicLayout = function BasicLayout(_ref) {
     topNavigationClassName: topNavigationClassName,
     topNavigationTrigger: topNavigationTrigger,
     onClickTopNavigation: onClickTopNavigation,
-    allProductsTitle: allProductsTitle || formatMessage(langObj["allProductsTitle"]),
+    allProductsTitle: allProductsTitle || intl.get("ec46c0b7-b38a-4048-af67-6ae0ec477c52").d("所有产品"),
     localeSwitcherOption: localeSwitcherOption,
     messageOption: messageOption,
     documentOption: documentOption,

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

@@ -1,7 +1,6 @@
 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 _useLocale2 from "@chaoswise/ui/lib/useLocale";
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 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; }
@@ -11,11 +10,11 @@ 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 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 useIntl from '../../../useIntl';
+import useConfigLocale from '../../../ConfigProvider/useLocale';
 import React from "react";
 import moment from "moment";
 import { readInnerMessageApi } from "../../service";
-import langConfig from "../../locale";
-import { formatMessage } from "../../../utils";
 import "./index.less";
 var TabList = function TabList(props) {
   var _props$messages = props.messages,
@@ -32,8 +31,9 @@ var TabList = function TabList(props) {
     code = props.code,
     onTabListAllRead = props.onTabListAllRead,
     renderMessageDateFormat = props.renderMessageDateFormat;
-  var _useLocale = _useLocale2(langConfig),
-    localeObj = _useLocale.langObj;
+  var intl = useIntl();
+  var _useConfigLocale = useConfigLocale(),
+    locale = _useConfigLocale.locale;
   var _readInnerMessageApi = requestOption.readInnerMessageApi;
   var onHandleMessage = function onHandleMessage(message) {
     var userMessageId = message.userMessageId,
@@ -65,7 +65,9 @@ var TabList = function TabList(props) {
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
-            resRequestApi = _readInnerMessageApi || readInnerMessageApi;
+            resRequestApi = _readInnerMessageApi || function (params, gateway) {
+              return readInnerMessageApi(params, gateway, locale);
+            };
             _context.n = 1;
             return resRequestApi(params, gatewayPrefix);
           case 1:
@@ -113,6 +115,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
-  }, formatMessage(localeObj["markAllRead"])), messageList);
+  }, intl.get("687e715c-51a9-42b7-906e-ddc011056d60").d("全部已读")), messageList);
 };
 export default TabList;

package/lib/CWMessage/MessageContent/index.js

@@ -7,7 +7,6 @@ import _Empty from "@chaoswise/ui/lib/Empty";
 import _Spin from "@chaoswise/ui/lib/Spin";
 import "@chaoswise/ui/lib/Badge/index.less";
 import _Badge from "@chaoswise/ui/lib/Badge";
-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";
@@ -27,40 +26,15 @@ 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 useConfigLocale from '../../ConfigProvider/useLocale';
 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;
-var localOptionsMap = {
-  en: "enName",
-  en_US: "enName",
-  zh_TW: "name",
-  zh: "name",
-  zh_CN: "name",
-  ja: "jaName",
-  ja_JP: "jaName"
-};
-
-// 获取本地化字段名的方法，提供兜底逻辑
-var getLocalizedField = function getLocalizedField(locale) {
-  return localOptionsMap[locale];
-};
-
-// 获取本地化的 tab 名称，最终兜底到 name 字段
-var getLocalizedTabName = function getLocalizedTabName(item, locale) {
-  var fieldName = getLocalizedField(locale);
-  // 判断 item 中是否包含转换后的字段
-  if (fieldName && fieldName in item) {
-    return item[fieldName];
-  }
-  // 否则使用 name 字段
-  return item.name;
-};
 var MessageContent = function MessageContent(props) {
   var hideOnSinglePage = props.hideOnSinglePage,
     setVisible = props.setVisible,
@@ -80,6 +54,14 @@ var MessageContent = function MessageContent(props) {
   var history = useHistory();
   var _useThemeSwitcher = useThemeSwitcher(),
     themeVars = _useThemeSwitcher.themeVars;
+  var intl = useIntl();
+  var _useConfigLocale = useConfigLocale(),
+    _useConfigLocale$loca = _useConfigLocale.locale,
+    locale = _useConfigLocale$loca === void 0 ? "zh_CN" : _useConfigLocale$loca;
+  var localeRef = useRef(locale);
+  localeRef.current = locale;
+  var listRequestRef = useRef(0);
+  var unreadRequestRef = useRef(0);
   // tabs头部配置项
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -104,56 +86,80 @@ var MessageContent = function MessageContent(props) {
     _getMessageListApi = requestOption.getMessageListApi,
     _getMessageUnreadCountApi = requestOption.getMessageUnreadCountApi;
   useEffect(function () {
+    var cancelled = false;
     _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-      var resRequestApi, res, _data$, data, params;
+      var resRequestApi, res, _data$, data, selected, params;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
-            resRequestApi = _getMessageTypeApi || getMessageTypeApi;
+            resRequestApi = _getMessageTypeApi || function (gateway) {
+              return getMessageTypeApi(gateway, locale);
+            };
             _context.n = 1;
             return resRequestApi(gatewayPrefix);
           case 1:
             res = _context.v;
+            if (!cancelled) {
+              _context.n = 2;
+              break;
+            }
+            return _context.a(2);
+          case 2:
             if (res && res.status == "success") {
               data = res.data;
               setTabOption(data);
+              // The backend localizes name. Refresh on language changes without
+              // discarding the currently selected category or page conditions.
+              selected = data.find(function (item) {
+                return item.code === conditionsRef.current.type;
+              });
               params = {
-                type: (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.code
+                type: selected ? selected.code : (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.code
               };
               getMessageList(params);
             }
             getMessageUnreadCount();
-          case 2:
+          case 3:
             return _context.a(2);
         }
       }, _callee);
     }))();
-  }, []);
-  var _useLocale = _useLocale2(langConfig),
-    localeObj = _useLocale.langObj,
-    _useLocale$locale = _useLocale.locale,
-    locale = _useLocale$locale === void 0 ? "zh_CN" : _useLocale$locale;
+    return function () {
+      cancelled = true;
+      listRequestRef.current++;
+      unreadRequestRef.current++;
+    };
+  }, [locale]);
   // 查询消息列表(接口)
   var getMessageList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(params) {
-      var resRequestApi, res, _res$data, _total, _res$data$records, records;
+      var requestId, resRequestApi, res, _res$data, _total, _res$data$records, records;
       return _regenerator().w(function (_context2) {
         while (1) switch (_context2.n) {
           case 0:
+            requestId = ++listRequestRef.current;
             setLoading(true);
             conditionsRef.current = _objectSpread(_objectSpread({}, conditionsRef.current), params);
-            resRequestApi = _getMessageListApi || getMessageListApi;
+            resRequestApi = _getMessageListApi || function (params, gateway) {
+              return getMessageListApi(params, gateway, locale);
+            };
             _context2.n = 1;
             return resRequestApi(conditionsRef.current, gatewayPrefix);
           case 1:
             res = _context2.v;
+            if (!(requestId !== listRequestRef.current || localeRef.current !== locale)) {
+              _context2.n = 2;
+              break;
+            }
+            return _context2.a(2);
+          case 2:
             if (res && res.status == "success") {
               _res$data = res.data, _total = _res$data.total, _res$data$records = _res$data.records, records = _res$data$records === void 0 ? [] : _res$data$records;
               setDataSource(records);
               setTotal(_total);
             }
             setLoading(false);
-          case 2:
+          case 3:
             return _context2.a(2);
         }
       }, _callee2);
@@ -165,21 +171,30 @@ var MessageContent = function MessageContent(props) {
   // 查询所有类型的未读消息数(接口)
   var getMessageUnreadCount = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-      var resRequestApi, res, _res$data$byType, byType, _unreadTypeArr;
+      var requestId, resRequestApi, res, _res$data$byType, byType, _unreadTypeArr;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
-            resRequestApi = _getMessageUnreadCountApi || getMessageUnreadCountApi;
+            requestId = ++unreadRequestRef.current;
+            resRequestApi = _getMessageUnreadCountApi || function (gateway) {
+              return getMessageUnreadCountApi(gateway, locale);
+            };
             _context3.n = 1;
             return resRequestApi(gatewayPrefix);
           case 1:
             res = _context3.v;
+            if (!(requestId !== unreadRequestRef.current || localeRef.current !== locale)) {
+              _context3.n = 2;
+              break;
+            }
+            return _context3.a(2);
+          case 2:
             if (res && res.status == "success") {
               _res$data$byType = res.data.byType, byType = _res$data$byType === void 0 ? {} : _res$data$byType;
               _unreadTypeArr = Object.keys(byType || {});
               setUnreadTypeArr(_unreadTypeArr);
             }
-          case 2:
+          case 3:
             return _context3.a(2);
         }
       }, _callee3);
@@ -234,7 +249,7 @@ var MessageContent = function MessageContent(props) {
       total: total
     };
   };
-  var emptyDescription = formatMessage(localeObj["no_new_messages"]);
+  var emptyDescription = intl.get("fcdcd88b-3db8-4216-a93a-ab79d854408d").d("暂无新消息");
   return /*#__PURE__*/React.createElement("div", {
     className: "cw-message-content"
   }, tabOption.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Tabs, {
@@ -242,8 +257,8 @@ var MessageContent = function MessageContent(props) {
     className: "cw-message-content-tabs",
     animated: false
   }, tabOption.map(function (item) {
-    var tabName = getLocalizedTabName(item, locale);
-    var moreTitle = formatMessage(localeObj["more"]);
+    var tabName = item.name;
+    var moreTitle = intl.get("a30db643-5238-42bc-bc5e-98a9d0c7df51").d("更多");
     return /*#__PURE__*/React.createElement(TabPane, {
       tab: unreadTypeArr.includes(item.code) ? /*#__PURE__*/React.createElement(_Badge, {
         color: themeVars["red-5"]
@@ -282,9 +297,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, formatMessage(localeObj["totalItems"], {
+  }, /*#__PURE__*/React.createElement("span", null, intl.get("205d9305-0c9e-4384-a5e2-4e1bbdc4a76f", {
     total: total
-  })), /*#__PURE__*/React.createElement(_Pagination, _extends({
+  }).d("共{total}条")), /*#__PURE__*/React.createElement(_Pagination, _extends({
     simple: true
   }, getPaginationOption())))) : /*#__PURE__*/React.createElement(_Empty, {
     description: emptyDescription