@tntd/monaco-editor 1.1.2 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tntd/monaco-editor",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "scripts": {
     "start": "webpack-dev-server  --config webpack.config.js",
     "build": "rm -rf ./dist && webpack --config webpack.config.build.js",
@@ -9,7 +9,6 @@
   },
   "peerDependencies": {
     "antd": ">=3.20.1 && <4.0.0",
-    "otp-intl": ">=0.0.1",
     "react": ">=16.0.0 && <17.0.0",
     "react-dom": ">=16.0.0 && <17.0.0",
     "tntd": ">=2.6.5"

package/src/I18N.js

@@ -1,40 +1,36 @@
 import { forwardRef } from 'react'
-import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'
 import Cookies from 'universal-cookie';
+import zhCN from '../.octopus/zh-CN';
+import enUS from '../.octopus/en-US';
+import thTH from '../.octopus/th-TH';
+import arEG from '../.octopus/ar-EG';
+import koKR from '../.octopus/ko-KR';
+import esES from '../.octopus/es-ES';
+import zhTW from '../.octopus/zh-TW';
+import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'
+
 const cookies = new Cookies();
 
-export const getLang = () => {
-    return cookies.get('lang') || 'cn';
+const mapLocale = {
+    'zh-cn': zhCN,
+    'zh-tw': zhTW,
+    en: enUS,
+    th: thTH, // 泰语
+    ar: arEG, // 阿拉伯语（埃及）
+    ko: koKR, // 韩语
+    es: esES // 西班牙语
 };
 
-const mapLocale =  {
-  'zh-cn': {
-    noData: '暂无数据',
-  },
-  'zh-tw': {
-     noData: '暫無資料',
-  },
-  en: {
-    noData: 'No data',
-  },
-  th: {
-    noData: 'ไม่มีข้อมูล',
-  }, // 泰语
-  ar: {
-    noData: 'مفيش بيانات'
-  }, // 阿拉伯语（埃及）
-  ko: {
-     noData: '데이터가 없습니다',
-  }, // 韩语
-  es: {
-    noData: 'Sin datos',
-  } // 西班牙语
+export const getLang = () => {
+    const lang = cookies.get('lang');
+    if (!lang || lang === 'cn') return 'zh-cn';
+    return lang;
 };
 
 /** 包的组件含有forwardRef, 去掉组件原有的forwardRef， 从props里获取ref **/
-export const WrapLocaleReceiverWithForwardRef = (Component, ref) => {
-  return forwardRef((props) => (
-    <LocaleReceiver componentName="TntdMonacoEditor">
+export const WrapLocaleReceiverWithForwardRef = (Component) => {
+  return forwardRef((props, ref) => (
+    <LocaleReceiver componentName="TntdMonacoEditor" defaultLocale={mapLocale[getLang()]}>
       {(locale, localeCode) => {
         const I18N = !!Object.keys(locale).length ? locale : (mapLocale[localeCode] || mapLocale[getLang()]);
         const transformLocaleCode = localeCode === 'zh-cn' ? 'cn' : localeCode;
@@ -45,3 +41,5 @@ export const WrapLocaleReceiverWithForwardRef = (Component, ref) => {
     </LocaleReceiver>
   ))
 }
+
+export default mapLocale;

package/src/core/BaseEditor.js

@@ -97,7 +97,7 @@ export class BaseEditor {
         //加载配置
         loader.config({
             paths: { vs: options.path || process.env.publicPath + '/vendor/vs' },
-            ...(getLang() === 'cn' ? { 'vs/nls': { availableLanguages: { '*': 'zh-cn' } } } : {})
+            ...(getLang() === 'zh-cn' ? { 'vs/nls': { availableLanguages: { '*': 'zh-cn' } } } : {})
         });
         this.monacoLoader = loader.init();
     }

package/src/locale/ar_EG.js

@@ -0,0 +1,5 @@
+import arEG from '../../.octopus/ar-EG/index.js'
+
+export default {
+  TntdMonacoEditor: arEG
+}

package/src/locale/en_US.js

@@ -0,0 +1,5 @@
+import enUS from '../../.octopus/en-US/index.js'
+
+export default {
+  TntdMonacoEditor: enUS
+}

package/src/locale/es_ES.js

@@ -0,0 +1,5 @@
+import esES from '../../.octopus/es-ES/index.js'
+
+export default {
+  TntdMonacoEditor: esES
+}

package/src/locale/ko_KR.js

@@ -0,0 +1,5 @@
+import koKR from '../../.octopus/ko-KR/index.js'
+
+export default {
+  TntdMonacoEditor: koKR
+}

package/src/locale/th_TH.js

@@ -0,0 +1,5 @@
+import thTH from '../../.octopus/th-TH/index.js'
+
+export default {
+  TntdMonacoEditor: thTH
+}

package/src/locale/zh_CN.js

@@ -0,0 +1,5 @@
+import zhCN from '../../.octopus/zh-CN/index.js'
+
+export default {
+  TntdMonacoEditor: zhCN
+}

package/src/locale/zh_TW.js

@@ -0,0 +1,5 @@
+import zhTW from '../../.octopus/zh-TW/index.js'
+
+export default {
+  TntdMonacoEditor: zhTW
+}