@tddc/assign-modal 3.1.3 → 3.1.5

package/es/AssignModal/AssignApp/Edit.js

@@ -161,7 +161,7 @@ import { useEffect, useState, useCallback, useRef, useMemo } from 'react';
 import { cloneDeep, debounce } from 'lodash';
 import './index.less';
 import { findSameCodePath, preorder, mergeAndDeduplicate, useWindowHeight } from './utils';
-import { getText } from '../../locale';
+import { getText } from '../../I18N';
 var path = []; // 上级机构到当前机构的路径
 
 var AssignModal = function AssignModal(props) {

package/es/AssignModal/AssignApp/View.js

@@ -91,7 +91,7 @@ import { useEffect, useState, useCallback, useRef, useMemo } from 'react';
 import { debounce } from 'lodash';
 import './index.less';
 import { findSameCodePath, preorder } from './utils';
-import { getText } from '../../locale';
+import { getText } from '../../I18N';
 var path = []; // 上级机构到当前机构的路径
 
 var AssignModal = function AssignModal(props) {

package/es/AssignModal/AssignApp/index.less

@@ -42,6 +42,7 @@
           position: sticky;
           top: 0px;
           z-index: 1;
+          height: 28px;
           // background: #f8f9fb;
         }
 

package/es/AssignModal/index.js

@@ -1,11 +1,11 @@
 import _Drawer from 'tntd/es/drawer';
 var _excluded = [
+  'lang',
   'visible',
   'close',
   'disabled',
   'title',
   'onSubmit',
-  'locale',
   'okText',
   'cancelText',
 ];
@@ -109,24 +109,35 @@ function _objectWithoutPropertiesLoose(r, e) {
   return t;
 }
 import React from 'react';
+import mapLocale, { getLang } from '../I18N';
 import { useState } from 'react';
 import AssignApp from './AssignApp';
 import './index.less';
-import Cookies from 'universal-cookie';
-var cookies = new Cookies();
+import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
 var AssignModal = function AssignModal(props) {
-  var visible = props.visible,
+  var locale = props.locale;
+  var lang = props.lang,
+    visible = props.visible,
     close = props.close,
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$title = props.title,
     title = _props$title === void 0 ? '' : _props$title,
     onSubmit = props.onSubmit,
-    locale = props.locale,
     _props$okText = props.okText,
-    okText = _props$okText === void 0 ? '确定' : _props$okText,
+    okText =
+      _props$okText === void 0
+        ? locale === null || locale === void 0
+          ? void 0
+          : locale.okText
+        : _props$okText,
     _props$cancelText = props.cancelText,
-    cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
+    cancelText =
+      _props$cancelText === void 0
+        ? locale === null || locale === void 0
+          ? void 0
+          : locale.cancelText
+        : _props$cancelText,
     restProps = _objectWithoutProperties(props, _excluded);
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -161,10 +172,7 @@ var AssignModal = function AssignModal(props) {
             setAssignData(data);
           },
           disabled: disabled,
-          lang:
-            (props === null || props === void 0 ? void 0 : props.lang) ||
-            cookies.get('lang') ||
-            'cn',
+          lang: lang,
           locale: locale,
         },
         restProps,
@@ -172,4 +180,23 @@ var AssignModal = function AssignModal(props) {
     ),
   );
 };
-export default AssignModal;
+export default (function (props) {
+  return /*#__PURE__*/ React.createElement(
+    LocaleReceiver,
+    {
+      componentName: 'AssignModal',
+    },
+    function (locale, localeCode) {
+      var I18N = !!Object.keys(locale).length
+        ? locale
+        : mapLocale[localeCode] || mapLocale[getLang()];
+      return /*#__PURE__*/ React.createElement(
+        AssignModal,
+        _extends({}, props, {
+          locale: I18N,
+          lang: localeCode || getLang(),
+        }),
+      );
+    },
+  );
+});

package/es/{locale.js → I18N.js}

@@ -18,50 +18,23 @@ function _typeof(o) {
   );
 }
 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';
 var cookies = new Cookies();
-export var zh_CN = {
-  authorizesOrgList: '机构列表',
-  allOrgAvailable: '全部机构',
-  authorizesAppList: '渠道列表',
-  allAppAvailable: '全部渠道',
-  authorizesUserList: '用户列表',
-  allUserAvailable: '全部用户',
-  search: '请输入机构名称',
-  availableOrgs: '可用机构',
-  availableApps: '可用渠道',
-  availableUsers: '可用用户',
-  clear: '清空',
-  hasBeenSelected: '已选',
-  numOfOrg: '%s 个机构',
-  numOfApp: '%s 个渠道',
-  numOfUser: '%s 个用户',
-  enterAppName: '请输入渠道名称',
-  enterUserName: '请输入用户名称',
-};
-export var en_US = {
-  authorizesOrgList: 'Organization List',
-  allOrgAvailable: 'All Organizations',
-  authorizesAppList: 'Channel List',
-  allAppAvailable: 'All Channels',
-  authorizesUserList: 'Account List',
-  allUserAvailable: 'All Accounts',
-  search: 'Organization name',
-  availableOrgs: 'Available Organizations',
-  availableApps: 'Available Channels',
-  availableUsers: 'Available Users',
-  clear: 'Clear',
-  hasBeenSelected: 'Selected',
-  numOfOrg: '%s Organizations',
-  numOfApp: '%s Channels',
-  numOfUser: '%s Accounts',
-  enterAppName: 'Enter Channel name',
-  enterUserName: 'Enter Account name',
-};
-
-// 内置语言包
 var builtInLocales = {
-  cn: zh_CN,
-  en: en_US,
+  'zh-cn': zhCN,
+  en: enUS,
+  th: thTH,
+  // 泰语
+  ar: arEG,
+  // 阿拉伯语（埃及）
+  ko: koKR,
+  // 韩语
+  es: esES, // 西班牙语
 };
 
 /**
@@ -91,7 +64,7 @@ export var getText = function getText(key, language, locale) {
     actualParams = locale !== undefined ? [locale].concat(params) : params;
   }
   var lang = language || getLanguage();
-  var builtIn = builtInLocales[lang] || zh_CN;
+  var builtIn = builtInLocales[lang] || builtInLocales['zh-cn'];
 
   // locale 是扁平对象（通过 createOtp 生成），直接覆盖内置语言包
   var text =
@@ -112,14 +85,18 @@ export var getText = function getText(key, language, locale) {
   }
   return text;
 };
-export var getLanguage = function getLanguage() {
-  return (
-    cookies.get('lang', {
-      path: '/',
-    }) || 'cn'
-  );
+export var getLang = function getLang() {
+  var lang = cookies.get('lang');
+  return lang !== 'cn' ? lang : 'zh-cn';
 };
 export default {
-  en_US: en_US,
-  zh_CN: zh_CN,
+  'zh-cn': zhCN,
+  en: enUS,
+  th: thTH,
+  // 泰语
+  ar: arEG,
+  // 阿拉伯语（埃及）
+  ko: koKR,
+  // 韩语
+  es: esES, // 西班牙语
 };

package/es/locale/ar-EG.js

@@ -0,0 +1,4 @@
+import arEG from '../.octopus/ar-EG';
+export default {
+  AssignModal: arEG,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tddc/assign-modal",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "assign-modal",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",
@@ -18,4 +18,4 @@
     "jsencrypt": "3.2.1"
   },
   "gitHead": "597697f3b6df285679feeabf56b25943a4ec89d4"
-}
+}

package/src/.octopus/ar-EG/index.js

@@ -0,0 +1,5 @@
+import test from './test';
+
+export default {
+  ...test,
+};

package/src/.octopus/ar-EG/test.js

@@ -0,0 +1,3 @@
+export default {
+  a: 'a',
+};

package/src/.octopus/en-US/index.js

@@ -0,0 +1,19 @@
+export default {
+  authorizesOrgList: 'Organization List',
+  allOrgAvailable: 'All Organizations',
+  authorizesAppList: 'Channel List',
+  allAppAvailable: 'All Channels',
+  authorizesUserList: 'Account List',
+  allUserAvailable: 'All Accounts',
+  search: 'Organization name',
+  availableOrgs: 'Available Organizations',
+  availableApps: 'Available Channels',
+  availableUsers: 'Available Users',
+  clear: 'Clear',
+  hasBeenSelected: 'Selected',
+  numOfOrg: '%s Organizations',
+  numOfApp: '%s Channels',
+  numOfUser: '%s Accounts',
+  enterAppName: 'Enter Channel name',
+  enterUserName: 'Enter Account name',
+};

package/src/.octopus/en-US/test.js

@@ -0,0 +1,3 @@
+export default {
+  a: 'a',
+};

package/src/.octopus/es-ES/index.js

@@ -0,0 +1,5 @@
+import test from './test';
+
+export default {
+  ...test,
+};

package/src/.octopus/es-ES/test.js

@@ -0,0 +1,3 @@
+export default {
+  a: 'a',
+};

package/src/.octopus/ko-KR/index.js

@@ -0,0 +1,5 @@
+import test from './test';
+
+export default {
+  ...test,
+};

package/src/.octopus/ko-KR/test.js

@@ -0,0 +1,3 @@
+export default {
+  a: 'a',
+};

package/src/.octopus/th-TH/index.js

@@ -0,0 +1,5 @@
+import test from './test';
+
+export default {
+  ...test,
+};

package/src/.octopus/th-TH/test.js

@@ -0,0 +1,3 @@
+export default {
+  a: 'a',
+};

package/src/.octopus/zh-CN/index.js

@@ -0,0 +1,19 @@
+export default {
+  authorizesOrgList: '机构列表',
+  allOrgAvailable: '全部机构',
+  authorizesAppList: '渠道列表',
+  allAppAvailable: '全部渠道',
+  authorizesUserList: '用户列表',
+  allUserAvailable: '全部用户',
+  search: '请输入机构名称',
+  availableOrgs: '可用机构',
+  availableApps: '可用渠道',
+  availableUsers: '可用用户',
+  clear: '清空',
+  hasBeenSelected: '已选',
+  numOfOrg: '%s 个机构',
+  numOfApp: '%s 个渠道',
+  numOfUser: '%s 个用户',
+  enterAppName: '请输入渠道名称',
+  enterUserName: '请输入用户名称',
+};

package/src/AssignModal/AssignApp/Edit.js

@@ -4,7 +4,7 @@ import { useEffect, useState, useCallback, useRef, useMemo } from 'react';
 import { cloneDeep, debounce } from 'lodash';
 import './index.less';
 import { findSameCodePath, preorder, mergeAndDeduplicate, useWindowHeight } from './utils';
-import { getText } from '../../locale';
+import { getText } from '../../I18N';
 
 let path = []; // 上级机构到当前机构的路径
 

package/src/AssignModal/AssignApp/View.js

@@ -4,7 +4,7 @@ import { useEffect, useState, useCallback, useRef, useMemo } from 'react';
 import { debounce } from 'lodash';
 import './index.less';
 import { findSameCodePath, preorder } from './utils';
-import { getText } from '../../locale';
+import { getText } from '../../I18N';
 
 let path = []; // 上级机构到当前机构的路径
 

package/src/AssignModal/AssignApp/index.less

@@ -42,6 +42,7 @@
           position: sticky;
           top: 0px;
           z-index: 1;
+          height: 28px;
           // background: #f8f9fb;
         }
 

package/src/AssignModal/index.js

@@ -1,21 +1,21 @@
+import mapLocale, { getLang } from '../I18N';
 import { Drawer } from 'tntd';
 import { useState } from 'react';
-
 import AssignApp from './AssignApp';
 import './index.less';
-import Cookies from 'universal-cookie';
-const cookies = new Cookies();
+import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
 
 const AssignModal = (props) => {
+  const { locale } = props;
   const {
+    lang,
     visible,
     close,
     disabled = false,
     title = '',
     onSubmit,
-    locale,
-    okText = '确定',
-    cancelText = '取消',
+    okText = locale?.okText,
+    cancelText = locale?.cancelText,
     ...restProps
   } = props;
   const [assignData, setAssignData] = useState({});
@@ -44,7 +44,7 @@ const AssignModal = (props) => {
           setAssignData(data);
         }}
         disabled={disabled}
-        lang={props?.lang || cookies.get('lang') || 'cn'}
+        lang={lang}
         locale={locale}
         {...restProps}
       />
@@ -52,4 +52,13 @@ const AssignModal = (props) => {
   );
 };
 
-export default AssignModal;
+export default (props) => (
+  <LocaleReceiver componentName="AssignModal">
+    {(locale, localeCode) => {
+      const I18N = !!Object.keys(locale).length
+        ? locale
+        : mapLocale[localeCode] || mapLocale[getLang()];
+      return <AssignModal {...props} locale={I18N} lang={localeCode || getLang()} />;
+    }}
+  </LocaleReceiver>
+);

package/src/I18N.js

@@ -0,0 +1,66 @@
+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';
+
+const cookies = new Cookies();
+
+const builtInLocales = {
+  'zh-cn': zhCN,
+  en: enUS,
+  th: thTH, // 泰语
+  ar: arEG, // 阿拉伯语（埃及）
+  ko: koKR, // 韩语
+  es: esES, // 西班牙语
+};
+
+/**
+ * 获取文本，支持外部传入的语言包覆盖
+ * @param {string} key - 文本 key
+ * @param {string} language - 语言标识
+ * @param {Object} locale - 外部传入的语言包（可选），通过 createOtp 生成的扁平对象
+ * @param {...any} params - 替换参数
+ */
+export const getText = (key, language, locale, ...params) => {
+  // 兼容旧的调用方式：getText(key, language, ...params)
+  // 新的调用方式：getText(key, language, locale, ...params)
+  let actualLocale = locale;
+  let actualParams = params;
+
+  // 如果 locale 不是对象或为 null，则认为是旧的调用方式
+  if (typeof locale !== 'object' || locale === null) {
+    actualLocale = null;
+    actualParams = locale !== undefined ? [locale, ...params] : params;
+  }
+
+  const lang = language || getLanguage();
+  const builtIn = builtInLocales[lang] || builtInLocales['zh-cn'];
+
+  // locale 是扁平对象（通过 createOtp 生成），直接覆盖内置语言包
+  const text = actualLocale?.[key] ?? builtIn[key];
+
+  if (actualParams?.length) {
+    return actualParams.reduce((acc, cur) => {
+      return acc?.replace(/%s/, cur);
+    }, text);
+  }
+
+  return text;
+};
+
+export const getLang = () => {
+  const lang = cookies.get('lang');
+  return lang !== 'cn' ? lang : 'zh-cn';
+};
+
+export default {
+  'zh-cn': zhCN,
+  en: enUS,
+  th: thTH, // 泰语
+  ar: arEG, // 阿拉伯语（埃及）
+  ko: koKR, // 韩语
+  es: esES, // 西班牙语
+};

package/src/locale/ar-EG.js

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

package/src/locale.js

@@ -1,87 +0,0 @@
-import Cookies from 'universal-cookie';
-
-const cookies = new Cookies();
-
-export const zh_CN = {
-  authorizesOrgList: '机构列表',
-  allOrgAvailable: '全部机构',
-  authorizesAppList: '渠道列表',
-  allAppAvailable: '全部渠道',
-  authorizesUserList: '用户列表',
-  allUserAvailable: '全部用户',
-  search: '请输入机构名称',
-  availableOrgs: '可用机构',
-  availableApps: '可用渠道',
-  availableUsers: '可用用户',
-  clear: '清空',
-  hasBeenSelected: '已选',
-  numOfOrg: '%s 个机构',
-  numOfApp: '%s 个渠道',
-  numOfUser: '%s 个用户',
-  enterAppName: '请输入渠道名称',
-  enterUserName: '请输入用户名称',
-};
-
-export const en_US = {
-  authorizesOrgList: 'Organization List',
-  allOrgAvailable: 'All Organizations',
-  authorizesAppList: 'Channel List',
-  allAppAvailable: 'All Channels',
-  authorizesUserList: 'Account List',
-  allUserAvailable: 'All Accounts',
-  search: 'Organization name',
-  availableOrgs: 'Available Organizations',
-  availableApps: 'Available Channels',
-  availableUsers: 'Available Users',
-  clear: 'Clear',
-  hasBeenSelected: 'Selected',
-  numOfOrg: '%s Organizations',
-  numOfApp: '%s Channels',
-  numOfUser: '%s Accounts',
-  enterAppName: 'Enter Channel name',
-  enterUserName: 'Enter Account name',
-};
-
-// 内置语言包
-const builtInLocales = {
-  cn: zh_CN,
-  en: en_US,
-};
-
-/**
- * 获取文本，支持外部传入的语言包覆盖
- * @param {string} key - 文本 key
- * @param {string} language - 语言标识
- * @param {Object} locale - 外部传入的语言包（可选），通过 createOtp 生成的扁平对象
- * @param {...any} params - 替换参数
- */
-export const getText = (key, language, locale, ...params) => {
-  // 兼容旧的调用方式：getText(key, language, ...params)
-  // 新的调用方式：getText(key, language, locale, ...params)
-  let actualLocale = locale;
-  let actualParams = params;
-
-  // 如果 locale 不是对象或为 null，则认为是旧的调用方式
-  if (typeof locale !== 'object' || locale === null) {
-    actualLocale = null;
-    actualParams = locale !== undefined ? [locale, ...params] : params;
-  }
-
-  const lang = language || getLanguage();
-  const builtIn = builtInLocales[lang] || zh_CN;
-
-  // locale 是扁平对象（通过 createOtp 生成），直接覆盖内置语言包
-  const text = actualLocale?.[key] ?? builtIn[key];
-
-  if (actualParams?.length) {
-    return actualParams.reduce((acc, cur) => {
-      return acc?.replace(/%s/, cur);
-    }, text);
-  }
-
-  return text;
-};
-
-export const getLanguage = () => cookies.get('lang', { path: '/' }) || 'cn';
-
-export default { en_US, zh_CN };