@tddc/assign-modal 3.0.8 → 3.1.0

package/es/AssignModal/AssignApp/Edit.js

@@ -182,7 +182,23 @@ var AssignModal = function AssignModal(props) {
     userList = _props$userList === void 0 ? [] : _props$userList,
     showUser = props.showUser,
     customOrgDisabled = props.customOrgDisabled,
-    customAppDisabled = props.customAppDisabled;
+    customAppDisabled = props.customAppDisabled,
+    locale = props.locale;
+
+  // 封装 getText，自动传入 locale
+  var t = function t(key) {
+    for (
+      var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      params[_key - 1] = arguments[_key];
+    }
+    return getText.apply(
+      void 0,
+      [key, props === null || props === void 0 ? void 0 : props.lang, locale].concat(params),
+    );
+  };
   var _dataItem$appCodes = dataItem.appCodes,
     appCodes = _dataItem$appCodes === void 0 ? [] : _dataItem$appCodes,
     _dataItem$orgCodes = dataItem.orgCodes,
@@ -225,18 +241,9 @@ var AssignModal = function AssignModal(props) {
     allApp = _useMemo2[1],
     allUser = _useMemo2[2];
   var titleOptions = [
-    ''.concat(
-      orgTitle ||
-        getText('availableOrgs', props === null || props === void 0 ? void 0 : props.lang),
-    ),
-    ''.concat(
-      appTitle ||
-        getText('availableApps', props === null || props === void 0 ? void 0 : props.lang),
-    ),
-    ''.concat(
-      userTitle ||
-        getText('availableUsers', props === null || props === void 0 ? void 0 : props.lang),
-    ),
+    ''.concat(orgTitle || t('availableOrgs')),
+    ''.concat(appTitle || t('availableApps')),
+    ''.concat(userTitle || t('availableUsers')),
   ];
   if (!showUser) {
     titleOptions.pop();
@@ -399,8 +406,8 @@ var AssignModal = function AssignModal(props) {
   );
   var onCheck = function onCheck() {
     var _node$childrenValues;
-    for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
-      rest[_key] = arguments[_key];
+    for (var _len2 = arguments.length, rest = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      rest[_key2] = arguments[_key2];
     }
     var checked = rest[0],
       node = rest[1],
@@ -1041,6 +1048,10 @@ var AssignModal = function AssignModal(props) {
     [appKeys],
   );
   console.log(canNotRemoveOrg, 'canNotRemove');
+
+  // 计算面板数量和平移距离
+  var panelCount = showUser ? 3 : 2;
+  var translateX = curIndex === 0 ? 0 : ''.concat(-(100 / panelCount) * curIndex, '%');
   return /*#__PURE__*/ React.createElement(
     React.Fragment,
     null,
@@ -1065,9 +1076,11 @@ var AssignModal = function AssignModal(props) {
       /*#__PURE__*/ React.createElement(
         'div',
         {
-          className: 'slider panel-'.concat(curIndex),
+          className: 'slider',
           style: {
-            width: !!showUser ? '300%' : '200%',
+            width: showUser ? '300%' : '200%',
+            transform: 'translateX('.concat(translateX, ')'),
+            transition: 'transform 0.2s ease',
           },
         },
         /*#__PURE__*/ React.createElement(
@@ -1085,11 +1098,7 @@ var AssignModal = function AssignModal(props) {
               {
                 className: 'title',
               },
-              orgTitle ||
-                getText(
-                  'authorizesOrgList',
-                  props === null || props === void 0 ? void 0 : props.lang,
-                ),
+              orgTitle || t('authorizesOrgList'),
             ),
             /*#__PURE__*/ React.createElement(
               'div',
@@ -1103,11 +1112,7 @@ var AssignModal = function AssignModal(props) {
                   checked: allOrgChecked,
                   disabled: disabled,
                 },
-                orgCheckboxTitle ||
-                  getText(
-                    'allOrgAvailable',
-                    props === null || props === void 0 ? void 0 : props.lang,
-                  ),
+                orgCheckboxTitle || t('allOrgAvailable'),
               ),
             ),
           ),
@@ -1126,10 +1131,7 @@ var AssignModal = function AssignModal(props) {
               },
               /*#__PURE__*/ React.createElement(_Input, {
                 size: 'small',
-                placeholder: getText(
-                  'search',
-                  props === null || props === void 0 ? void 0 : props.lang,
-                ),
+                placeholder: t('search'),
                 onChange: function onChange(e) {
                   debouncedOrgSearch(e.target.value);
                 },
@@ -1174,17 +1176,9 @@ var AssignModal = function AssignModal(props) {
                 /*#__PURE__*/ React.createElement(
                   'span',
                   null,
-                  getText(
-                    'hasBeenSelected',
-                    props === null || props === void 0 ? void 0 : props.lang,
-                  ),
-                  ':',
-                  ' ',
-                  getText(
-                    'numOfOrg',
-                    props === null || props === void 0 ? void 0 : props.lang,
-                    areadySelectOrg.length || 0,
-                  ),
+                  t('hasBeenSelected'),
+                  ': ',
+                  t('numOfOrg', areadySelectOrg.length || 0),
                 ),
                 /*#__PURE__*/ React.createElement(
                   'a',
@@ -1194,7 +1188,7 @@ var AssignModal = function AssignModal(props) {
                       return onRemoveAllOrg();
                     },
                   },
-                  getText('clear', props === null || props === void 0 ? void 0 : props.lang),
+                  t('clear'),
                 ),
               ),
               /*#__PURE__*/ React.createElement(
@@ -1265,11 +1259,7 @@ var AssignModal = function AssignModal(props) {
               {
                 className: 'title',
               },
-              appTitle ||
-                getText(
-                  'authorizesAppList',
-                  props === null || props === void 0 ? void 0 : props.lang,
-                ),
+              appTitle || t('authorizesAppList'),
             ),
             /*#__PURE__*/ React.createElement(
               'div',
@@ -1283,11 +1273,7 @@ var AssignModal = function AssignModal(props) {
                   checked: allAppChecked,
                   disabled: disabled,
                 },
-                appCheckboxTitle ||
-                  getText(
-                    'allAppAvailable',
-                    props === null || props === void 0 ? void 0 : props.lang,
-                  ),
+                appCheckboxTitle || t('allAppAvailable'),
               ),
             ),
           ),
@@ -1305,10 +1291,7 @@ var AssignModal = function AssignModal(props) {
                 onChange: function onChange(e) {
                   debouncedAppSearch(e.target.value);
                 },
-                placeholder: getText(
-                  'enterAppName',
-                  props === null || props === void 0 ? void 0 : props.lang,
-                ),
+                placeholder: t('enterAppName'),
                 size: 'small',
                 suffix: /*#__PURE__*/ React.createElement(_Icon, {
                   type: 'zoom',
@@ -1333,17 +1316,9 @@ var AssignModal = function AssignModal(props) {
                 /*#__PURE__*/ React.createElement(
                   'span',
                   null,
-                  getText(
-                    'hasBeenSelected',
-                    props === null || props === void 0 ? void 0 : props.lang,
-                  ),
-                  ':',
-                  ' ',
-                  getText(
-                    'numOfApp',
-                    props === null || props === void 0 ? void 0 : props.lang,
-                    areadySelectApp.length || 0,
-                  ),
+                  t('hasBeenSelected'),
+                  ': ',
+                  t('numOfApp', areadySelectApp.length || 0),
                 ),
                 /*#__PURE__*/ React.createElement(
                   'a',
@@ -1353,7 +1328,7 @@ var AssignModal = function AssignModal(props) {
                       return onRemoveAllApp();
                     },
                   },
-                  getText('clear', props === null || props === void 0 ? void 0 : props.lang),
+                  t('clear'),
                 ),
               ),
               /*#__PURE__*/ React.createElement(
@@ -1412,11 +1387,7 @@ var AssignModal = function AssignModal(props) {
                 {
                   className: 'title',
                 },
-                userTitle ||
-                  getText(
-                    'authorizesUserList',
-                    props === null || props === void 0 ? void 0 : props.lang,
-                  ),
+                userTitle || t('authorizesUserList'),
               ),
               /*#__PURE__*/ React.createElement(
                 'div',
@@ -1430,11 +1401,7 @@ var AssignModal = function AssignModal(props) {
                     checked: allUserChecked,
                     disabled: disabled,
                   },
-                  userCheckboxTitle ||
-                    getText(
-                      'allUserAvailable',
-                      props === null || props === void 0 ? void 0 : props.lang,
-                    ),
+                  userCheckboxTitle || t('allUserAvailable'),
                 ),
               ),
             ),
@@ -1450,10 +1417,7 @@ var AssignModal = function AssignModal(props) {
                 },
                 /*#__PURE__*/ React.createElement(_Input, {
                   size: 'small',
-                  placeholder: getText(
-                    'enterUserName',
-                    props === null || props === void 0 ? void 0 : props.lang,
-                  ),
+                  placeholder: t('enterUserName'),
                   onChange: function onChange(e) {
                     debouncedUserSearch(e.target.value);
                   },
@@ -1480,26 +1444,18 @@ var AssignModal = function AssignModal(props) {
                   /*#__PURE__*/ React.createElement(
                     'span',
                     null,
-                    getText(
-                      'hasBeenSelected',
-                      props === null || props === void 0 ? void 0 : props.lang,
-                    ),
-                    ':',
-                    ' ',
-                    getText(
-                      'numOfUser',
-                      props === null || props === void 0 ? void 0 : props.lang,
-                      areadySelectUser.length || 0,
-                    ),
+                    t('hasBeenSelected'),
+                    ': ',
+                    t('numOfUser', areadySelectUser.length || 0),
                   ),
                   /*#__PURE__*/ React.createElement(
                     'a',
                     {
                       onClick: function onClick() {
-                        return onRemoveAllOrg();
+                        return onRemoveAllUser();
                       },
                     },
-                    getText('clear', props === null || props === void 0 ? void 0 : props.lang),
+                    t('clear'),
                   ),
                 ),
                 /*#__PURE__*/ React.createElement(
@@ -1510,7 +1466,7 @@ var AssignModal = function AssignModal(props) {
                   userKeys.map(function (item, index) {
                     var node = userMapRef.current[item] || {};
                     var userName = node.userName;
-                    var isOwnAppCode = accounts === node.account;
+                    var isOwnUserCode = account === node.account;
                     if (!userName && !node.account) return null; // 不显示多余数据
                     return /*#__PURE__*/ React.createElement(
                       'li',
@@ -1527,7 +1483,7 @@ var AssignModal = function AssignModal(props) {
                           title: userName,
                         }),
                       ),
-                      !isOwnAppCode &&
+                      !isOwnUserCode &&
                         /*#__PURE__*/ React.createElement(_Icon, {
                           type: 'close',
                           className: 'close-icon',

package/es/AssignModal/AssignApp/View.js

@@ -105,7 +105,23 @@ var AssignModal = function AssignModal(props) {
     userTitle = props.userTitle,
     _props$userList = props.userList,
     userList = _props$userList === void 0 ? [] : _props$userList,
-    showUser = props.showUser;
+    showUser = props.showUser,
+    locale = props.locale;
+
+  // 封装 getText，自动传入 locale
+  var t = function t(key) {
+    for (
+      var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      params[_key - 1] = arguments[_key];
+    }
+    return getText.apply(
+      void 0,
+      [key, props === null || props === void 0 ? void 0 : props.lang, locale].concat(params),
+    );
+  };
   var _dataItem$appCodes = dataItem.appCodes,
     appCodes = _dataItem$appCodes === void 0 ? [] : _dataItem$appCodes,
     _dataItem$orgCodes = dataItem.orgCodes,
@@ -498,11 +514,7 @@ var AssignModal = function AssignModal(props) {
             {
               className: 'title',
             },
-            orgTitle ||
-              getText(
-                'authorizesOrgList',
-                props === null || props === void 0 ? void 0 : props.lang,
-              ),
+            orgTitle || t('authorizesOrgList'),
           ),
         ),
         /*#__PURE__*/ React.createElement(
@@ -517,10 +529,7 @@ var AssignModal = function AssignModal(props) {
             },
             /*#__PURE__*/ React.createElement(_Input, {
               size: 'small',
-              placeholder: getText(
-                'search',
-                props === null || props === void 0 ? void 0 : props.lang,
-              ),
+              placeholder: t('search'),
               onChange: function onChange(e) {
                 debouncedOrgSearch(e.target.value);
               },
@@ -550,11 +559,7 @@ var AssignModal = function AssignModal(props) {
             {
               className: 'title',
             },
-            appTitle ||
-              getText(
-                'authorizesAppList',
-                props === null || props === void 0 ? void 0 : props.lang,
-              ),
+            appTitle || t('authorizesAppList'),
           ),
         ),
         /*#__PURE__*/ React.createElement(
@@ -566,10 +571,7 @@ var AssignModal = function AssignModal(props) {
             onChange: function onChange(e) {
               debouncedAppSearch(e.target.value);
             },
-            placeholder: getText(
-              'enterAppName',
-              props === null || props === void 0 ? void 0 : props.lang,
-            ),
+            placeholder: t('enterAppName'),
             size: 'small',
             suffix: /*#__PURE__*/ React.createElement(_Icon, {
               type: 'zoom',
@@ -603,11 +605,7 @@ var AssignModal = function AssignModal(props) {
               {
                 className: 'title',
               },
-              userTitle ||
-                getText(
-                  'authorizesUserList',
-                  props === null || props === void 0 ? void 0 : props.lang,
-                ),
+              userTitle || t('authorizesUserList'),
             ),
           ),
           /*#__PURE__*/ React.createElement(
@@ -617,10 +615,7 @@ var AssignModal = function AssignModal(props) {
             },
             /*#__PURE__*/ React.createElement(_Input, {
               size: 'small',
-              placeholder: getText(
-                'enterUserName',
-                props === null || props === void 0 ? void 0 : props.lang,
-              ),
+              placeholder: t('enterUserName'),
               onChange: function onChange(e) {
                 debouncedUserSearch(e.target.value);
               },

package/es/AssignModal/AssignApp/index.less

@@ -8,12 +8,11 @@
     display: flex;
     height: calc(100% - 24px);
     margin-top: 16px;
-    transition: transform 0.2s ease;
+    // transition 已移至 inline style，支持动态面板数量
 
     .panel {
-      // width: 650px;
-      flex: 1;
-      min-width: 652px;
+      flex: 1 0 0; // flex-grow: 1, flex-shrink: 0, flex-basis: 0
+      // 每个面板平分 slider 宽度，不压缩，从 0 基准开始计算
       height: 100%;
       padding: 16px;
       overflow: hidden;
@@ -161,18 +160,6 @@
     }
   }
 
-  .slider.panel-0 {
-    transform: translateX(0);
-  }
-
-  .slider.panel-1 {
-    transform: translateX(-852px);
-  }
-
-  .slider.panel-2 {
-    transform: translateX(-1504px);
-  }
-
   .menu-header {
     & {
       display: flex;

package/es/AssignModal/AssignApp/utils.js

@@ -153,7 +153,7 @@ export var preorder = function preorder(root, cb) {
       root.show = true;
     }
     res.push(root.code || root.key);
-    cb && cb(root.key, root);
+    cb && cb(root.code || root.key, root);
     for (
       var i = 0;
       i <

package/es/AssignModal/index.js

@@ -1,5 +1,14 @@
 import _Drawer from 'tntd/es/drawer';
-var _excluded = ['visible', 'close', 'disabled', 'title', 'onSubmit'];
+var _excluded = [
+  'visible',
+  'close',
+  'disabled',
+  'title',
+  'onSubmit',
+  'locale',
+  'okText',
+  'cancelText',
+];
 function _extends() {
   return (
     (_extends = Object.assign
@@ -108,10 +117,16 @@ var cookies = new Cookies();
 var AssignModal = function AssignModal(props) {
   var visible = props.visible,
     close = props.close,
-    disabled = props.disabled,
+    _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,
+    _props$cancelText = props.cancelText,
+    cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
     restProps = _objectWithoutProperties(props, _excluded);
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -129,6 +144,8 @@ var AssignModal = function AssignModal(props) {
       width: 900,
       onCancel: close,
       onOk: submit,
+      // okText={okText}
+      // cancelText={cancelText}
       maskClosable: disabled,
       destroyOnClose: true,
       showFooter: !disabled,
@@ -148,6 +165,7 @@ var AssignModal = function AssignModal(props) {
             (props === null || props === void 0 ? void 0 : props.lang) ||
             cookies.get('lang') ||
             'cn',
+          locale: locale,
         },
         restProps,
       ),

package/es/locale.js

@@ -1,3 +1,22 @@
+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 Cookies from 'universal-cookie';
 var cookies = new Cookies();
 export var zh_CN = {
@@ -38,26 +57,57 @@ export var en_US = {
   enterAppName: 'Enter Channel name',
   enterUserName: 'Enter Account name',
 };
-export var getText = function getText(key, language) {
-  var _ref;
-  var text =
-    (_ref =
-      {
-        cn: zh_CN,
-        en: en_US,
-      }[language || getLanguage()] || zh_CN) === null || _ref === void 0
-      ? void 0
-      : _ref[key];
+
+// 内置语言包
+var builtInLocales = {
+  cn: zh_CN,
+  en: en_US,
+};
+
+/**
+ * 获取文本，支持外部传入的语言包覆盖
+ * @param {string} key - 文本 key
+ * @param {string} language - 语言标识
+ * @param {Object} locale - 外部传入的语言包（可选），通过 createOtp 生成的扁平对象
+ * @param {...any} params - 替换参数
+ */
+export var getText = function getText(key, language, locale) {
+  var _actualLocale$key, _actualLocale, _actualParams;
+  // 兼容旧的调用方式：getText(key, language, ...params)
+  // 新的调用方式：getText(key, language, locale, ...params)
+  var actualLocale = locale;
   for (
-    var _len = arguments.length, params = new Array(_len > 2 ? _len - 2 : 0), _key = 2;
+    var _len = arguments.length, params = new Array(_len > 3 ? _len - 3 : 0), _key = 3;
     _key < _len;
     _key++
   ) {
-    params[_key - 2] = arguments[_key];
+    params[_key - 3] = arguments[_key];
   }
-  if (params === null || params === void 0 ? void 0 : params.length) {
-    return params.reduce(function (acc, cur) {
-      return acc.replace(/%s/, cur);
+  var actualParams = params;
+
+  // 如果 locale 不是对象或为 null，则认为是旧的调用方式
+  if (_typeof(locale) !== 'object' || locale === null) {
+    actualLocale = null;
+    actualParams = locale !== undefined ? [locale].concat(params) : params;
+  }
+  var lang = language || getLanguage();
+  var builtIn = builtInLocales[lang] || zh_CN;
+
+  // locale 是扁平对象（通过 createOtp 生成），直接覆盖内置语言包
+  var text =
+    (_actualLocale$key =
+      (_actualLocale = actualLocale) === null || _actualLocale === void 0
+        ? void 0
+        : _actualLocale[key]) !== null && _actualLocale$key !== void 0
+      ? _actualLocale$key
+      : builtIn[key];
+  if (
+    (_actualParams = actualParams) === null || _actualParams === void 0
+      ? void 0
+      : _actualParams.length
+  ) {
+    return actualParams.reduce(function (acc, cur) {
+      return acc === null || acc === void 0 ? void 0 : acc.replace(/%s/, cur);
     }, text);
   }
   return text;

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@tddc/assign-modal",
-  "version": "3.0.8",
+  "version": "3.1.0",
   "description": "assign-modal",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",
   "main": "es/index.js",
   "files": [
-    "es"
+    "es",
+    "src",
+    "README.md"
   ],
   "devDependencies": {
     "universal-cookie": ">=2.2.0",