@chaoswise/ui 2.4.0 → 2.4.1

package/lib/CWMessage/MessageContent/index.js

@@ -35,6 +35,13 @@ 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"
+};
 var MessageContent = function MessageContent(props) {
   var hideOnSinglePage = props.hideOnSinglePage,
     setVisible = props.setVisible,
@@ -218,7 +225,7 @@ var MessageContent = function MessageContent(props) {
     className: "cw-message-content-tabs",
     animated: false
   }, tabOption.map(function (item) {
-    var tabName = item.name;
+    var tabName = item[localOptionsMap[locale]];
     var moreTitle = formatMessage(localeObj["more"]);
     return /*#__PURE__*/React.createElement(TabPane, {
       tab: unreadTypeArr.includes(item.code) ? /*#__PURE__*/React.createElement(_Badge, {

package/lib/ConfigProvider/ConfigProvider.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 "antd/es/config-provider/style";
 import _ConfigProvider from "antd/es/config-provider";
-var _excluded = ["children", "locales", "defaultLocale"];
+var _excluded = ["children", "locales", "defaultLocale", "messages"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function 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; }
@@ -19,11 +19,29 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useEffect, useState } from 'react';
 import Antd4ConfigProvider from '../Antd4/config-provider';
 import { IntlProvider } from 'react-intl';
-import zh_CN_antd from '../Antd4/locale/zh_CN';
-import en_US_antd from '../Antd4/locale/en_US';
-import zh_TW_antd from '../Antd4/locale/zh_TW';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
+import zh_CN_antd4 from '../Antd4/locale/zh_CN';
+import en_US_antd4 from '../Antd4/locale/en_US';
+import zh_TW_antd4 from '../Antd4/locale/zh_TW';
+import zh_CN_antd from 'antd/es/locale/zh_CN';
+import zh_TW_antd from 'antd/es/locale/zh_TW';
+import en_US_antd from 'antd/es/locale/en_US';
+var ANTD4_LOCALE_MAP = {
+  zh_CN: zh_CN_antd4,
+  en_US: en_US_antd4,
+  zh_TW: zh_TW_antd4
+};
+var ANTD3_LOCALE_MAP = {
+  zh_CN: zh_CN_antd,
+  en_US: en_US_antd,
+  zh_TW: zh_TW_antd
+};
+var I18N_MAP = {
+  zh_CN: 'zh',
+  en_US: 'en',
+  zh_TW: 'zh'
+};
 export var intlContext = /*#__PURE__*/React.createContext({
   localeContext: {
     locale: '',
@@ -31,42 +49,44 @@ export var intlContext = /*#__PURE__*/React.createContext({
   }
 });
 var Provider = intlContext.Provider;
+
+// 兼容映射
+var LOCALE_MAP = {
+  zh: 'zh_CN',
+  en: 'en_US'
+};
 var AllProvider = function AllProvider(_ref) {
+  var _locales$locale;
   var children = _ref.children,
     _ref$locales = _ref.locales,
     locales = _ref$locales === void 0 ? {} : _ref$locales,
     _ref$defaultLocale = _ref.defaultLocale,
     defaultLocale = _ref$defaultLocale === void 0 ? 'zh_CN' : _ref$defaultLocale,
+    messages = _ref.messages,
     resProps = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(defaultLocale),
     _useState2 = _slicedToArray(_useState, 2),
     locale = _useState2[0],
     setLocale = _useState2[1];
-  useEffect(function () {
-    if (locale && locales[locale]) {
-      moment.locale(locales[locale].momentLocal);
+  var currentLocale = LOCALE_MAP[locale] || locale;
+  var getMomentLocale = function getMomentLocale(currentLocale) {
+    if (['zh_CN', 'zh_TW'].includes(currentLocale)) {
+      return 'zh-cn';
     }
-  }, [locale, locales]);
-  var nowLocalInfo = locales[locale] || {};
+    return 'en';
+  };
+  useEffect(function () {
+    moment.locale(getMomentLocale(currentLocale));
 
-  // 文案按UX规范，原始为 No Data && 兼容老版本
-  if (['en', 'en_US'].includes(locale)) {
-    if (nowLocalInfo.antdLocale) {
-      nowLocalInfo.antdLocale.Empty.description = 'No data';
+    // 文案按UX规范，原始为 No Data
+    if (currentLocale === 'en_US') {
+      ANTD3_LOCALE_MAP[currentLocale].Empty.description = 'No data';
     }
-  }
+  }, [currentLocale]);
   var configProps = _objectSpread({
-    locale: nowLocalInfo.antdLocale,
+    locale: ANTD3_LOCALE_MAP[currentLocale],
     autoInsertSpaceInButton: false
   }, resProps);
-  var Antd4Local = {
-    zh_CN_antd: zh_CN_antd,
-    zh_TW_antd: zh_TW_antd,
-    en_US_antd: en_US_antd,
-    // 兼容老版本
-    zh: zh_CN_antd,
-    en: en_US_antd
-  };
   return /*#__PURE__*/React.createElement(Provider, {
     value: {
       locale: locale,
@@ -74,10 +94,10 @@ var AllProvider = function AllProvider(_ref) {
       locales: locales
     }
   }, /*#__PURE__*/React.createElement(_ConfigProvider, configProps, /*#__PURE__*/React.createElement(Antd4ConfigProvider, _extends({}, configProps, {
-    locale: Antd4Local[locale]
-  }), nowLocalInfo.intlLocale ? /*#__PURE__*/React.createElement(IntlProvider, {
-    locale: nowLocalInfo.intlLocale,
-    messages: nowLocalInfo.messages
-  }, children) : children)));
+    locale: ANTD4_LOCALE_MAP[currentLocale]
+  }), /*#__PURE__*/React.createElement(IntlProvider, {
+    locale: I18N_MAP[currentLocale],
+    messages: messages ? messages : (_locales$locale = locales[locale]) === null || _locales$locale === void 0 ? void 0 : _locales$locale.messages
+  }, children))));
 };
 export default AllProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -143,5 +143,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "1ed8349a4b9153e90b072cc27cc5531ce6524e55"
+  "gitHead": "7a1c75490a7afac8fa31b8bff80bc00a59f60e57"
 }