@tddc/assign-modal 3.1.4 → 3.1.5

package/es/AssignModal/index.js

@@ -1,6 +1,6 @@
 import _Drawer from 'tntd/es/drawer';
 var _excluded = [
-  'I18N',
+  'lang',
   'visible',
   'close',
   'disabled',
@@ -113,12 +113,10 @@ import mapLocale, { getLang } from '../I18N';
 import { useState } from 'react';
 import AssignApp from './AssignApp';
 import './index.less';
-import Cookies from 'universal-cookie';
 import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
-var cookies = new Cookies();
 var AssignModal = function AssignModal(props) {
   var locale = props.locale;
-  var I18N = props.I18N,
+  var lang = props.lang,
     visible = props.visible,
     close = props.close,
     _props$disabled = props.disabled,
@@ -148,6 +146,41 @@ var AssignModal = function AssignModal(props) {
   var submit = function submit() {
     onSubmit(assignData);
   };
+  return /*#__PURE__*/ React.createElement(
+    _Drawer,
+    {
+      className: 'modal-assign',
+      title: title,
+      visible: visible,
+      width: 900,
+      onCancel: close,
+      onOk: submit,
+      // okText={okText}
+      // cancelText={cancelText}
+      maskClosable: disabled,
+      destroyOnClose: true,
+      showFooter: !disabled,
+      okButtonProps: {
+        disabled: disabled,
+      },
+    },
+    /*#__PURE__*/ React.createElement(
+      AssignApp,
+      _extends(
+        {
+          onChange: function onChange(data) {
+            setAssignData(data);
+          },
+          disabled: disabled,
+          lang: lang,
+          locale: locale,
+        },
+        restProps,
+      ),
+    ),
+  );
+};
+export default (function (props) {
   return /*#__PURE__*/ React.createElement(
     LocaleReceiver,
     {
@@ -158,42 +191,12 @@ var AssignModal = function AssignModal(props) {
         ? locale
         : mapLocale[localeCode] || mapLocale[getLang()];
       return /*#__PURE__*/ React.createElement(
-        _Drawer,
-        {
-          className: 'modal-assign',
-          title: title,
-          visible: visible,
-          width: 900,
-          onCancel: close,
-          onOk: submit,
-          // okText={okText}
-          // cancelText={cancelText}
-          maskClosable: disabled,
-          destroyOnClose: true,
-          showFooter: !disabled,
-          okButtonProps: {
-            disabled: disabled,
-          },
-        },
-        /*#__PURE__*/ React.createElement(
-          AssignApp,
-          _extends(
-            {
-              onChange: function onChange(data) {
-                setAssignData(data);
-              },
-              disabled: disabled,
-              lang:
-                (props === null || props === void 0 ? void 0 : props.lang) ||
-                cookies.get('lang') ||
-                'cn',
-              locale: I18N,
-            },
-            restProps,
-          ),
-        ),
+        AssignModal,
+        _extends({}, props, {
+          locale: I18N,
+          lang: localeCode || getLang(),
+        }),
       );
     },
   );
-};
-export default AssignModal;
+});

package/es/I18N.js

@@ -25,17 +25,16 @@ import arEG from './.octopus/ar-EG';
 import koKR from './.octopus/ko-KR';
 import esES from './.octopus/es-ES';
 var cookies = new Cookies();
-
-// 语言包映射
 var builtInLocales = {
   'zh-cn': zhCN,
-  cn: zhCN,
-  // 兼容旧的 'cn' 标识
   en: enUS,
   th: thTH,
+  // 泰语
   ar: arEG,
+  // 阿拉伯语（埃及）
   ko: koKR,
-  es: esES,
+  // 韩语
+  es: esES, // 西班牙语
 };
 
 /**
@@ -64,7 +63,7 @@ export var getText = function getText(key, language, locale) {
     actualLocale = null;
     actualParams = locale !== undefined ? [locale].concat(params) : params;
   }
-  var lang = language || getLang();
+  var lang = language || getLanguage();
   var builtIn = builtInLocales[lang] || builtInLocales['zh-cn'];
 
   // locale 是扁平对象（通过 createOtp 生成），直接覆盖内置语言包

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tddc/assign-modal",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "assign-modal",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",

package/src/AssignModal/index.js

@@ -3,15 +3,12 @@ import { Drawer } from 'tntd';
 import { useState } from 'react';
 import AssignApp from './AssignApp';
 import './index.less';
-import Cookies from 'universal-cookie';
 import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
 
-const cookies = new Cookies();
-
 const AssignModal = (props) => {
   const { locale } = props;
   const {
-    I18N,
+    lang,
     visible,
     close,
     disabled = false,
@@ -28,40 +25,40 @@ const AssignModal = (props) => {
   };
 
   return (
-    <LocaleReceiver componentName="AssignModal">
-      {(locale, localeCode) => {
-        const I18N = !!Object.keys(locale).length
-          ? locale
-          : mapLocale[localeCode] || mapLocale[getLang()];
-        return (
-          <Drawer
-            className="modal-assign"
-            title={title}
-            visible={visible}
-            width={900}
-            onCancel={close}
-            onOk={submit}
-            // okText={okText}
-            // cancelText={cancelText}
-            maskClosable={disabled}
-            destroyOnClose
-            showFooter={!disabled}
-            okButtonProps={{ disabled }}
-          >
-            <AssignApp
-              onChange={(data) => {
-                setAssignData(data);
-              }}
-              disabled={disabled}
-              lang={props?.lang || cookies.get('lang') || 'cn'}
-              locale={I18N}
-              {...restProps}
-            />
-          </Drawer>
-        );
-      }}
-    </LocaleReceiver>
+    <Drawer
+      className="modal-assign"
+      title={title}
+      visible={visible}
+      width={900}
+      onCancel={close}
+      onOk={submit}
+      // okText={okText}
+      // cancelText={cancelText}
+      maskClosable={disabled}
+      destroyOnClose
+      showFooter={!disabled}
+      okButtonProps={{ disabled }}
+    >
+      <AssignApp
+        onChange={(data) => {
+          setAssignData(data);
+        }}
+        disabled={disabled}
+        lang={lang}
+        locale={locale}
+        {...restProps}
+      />
+    </Drawer>
   );
 };
 
-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

@@ -8,15 +8,13 @@ import esES from './.octopus/es-ES';
 
 const cookies = new Cookies();
 
-// 语言包映射
 const builtInLocales = {
   'zh-cn': zhCN,
-  cn: zhCN, // 兼容旧的 'cn' 标识
   en: enUS,
-  th: thTH,
-  ar: arEG,
-  ko: koKR,
-  es: esES,
+  th: thTH, // 泰语
+  ar: arEG, // 阿拉伯语（埃及）
+  ko: koKR, // 韩语
+  es: esES, // 西班牙语
 };
 
 /**
@@ -38,7 +36,7 @@ export const getText = (key, language, locale, ...params) => {
     actualParams = locale !== undefined ? [locale, ...params] : params;
   }
 
-  const lang = language || getLang();
+  const lang = language || getLanguage();
   const builtIn = builtInLocales[lang] || builtInLocales['zh-cn'];
 
   // locale 是扁平对象（通过 createOtp 生成），直接覆盖内置语言包