@tddc/assign-modal 3.0.7 → 3.0.9

package/es/AssignModal/AssignApp/index.js

@@ -1,7 +1,9 @@
-import React from "react";
+import React from 'react';
 import View from './View';
 import Edit from './Edit';
 var AssignModal = function AssignModal(props) {
-  return props.disabled ? /*#__PURE__*/React.createElement(View, props) : /*#__PURE__*/React.createElement(Edit, props);
+  return props.disabled
+    ? /*#__PURE__*/ React.createElement(View, props)
+    : /*#__PURE__*/ React.createElement(Edit, props);
 };
-export default AssignModal;
+export default AssignModal;

package/es/AssignModal/AssignApp/index.less

@@ -45,6 +45,10 @@
           z-index: 1;
           // background: #f8f9fb;
         }
+
+        > .ant-checkbox-wrapper {
+          margin-left: 8px;
+        }
       }
 
       .panel-right {

package/es/AssignModal/AssignApp/utils.js

@@ -1,13 +1,86 @@
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _slicedToArray(r, e) {
+  return (
+    _arrayWithHoles(r) ||
+    _iterableToArrayLimit(r, e) ||
+    _unsupportedIterableToArray(r, e) ||
+    _nonIterableRest()
+  );
+}
+function _nonIterableRest() {
+  throw new TypeError(
+    'Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.',
+  );
+}
+function _iterableToArrayLimit(r, l) {
+  var t =
+    null == r ? null : ('undefined' != typeof Symbol && r[Symbol.iterator]) || r['@@iterator'];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
+    try {
+      if (((i = (t = t.call(r)).next), 0 === l)) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      (o = !0), (n = r);
+    } finally {
+      try {
+        if (!f && null != t.return && ((u = t.return()), Object(u) !== u)) return;
+      } finally {
+        if (o) throw n;
+      }
+    }
+    return a;
+  }
+}
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+function _toConsumableArray(r) {
+  return (
+    _arrayWithoutHoles(r) ||
+    _iterableToArray(r) ||
+    _unsupportedIterableToArray(r) ||
+    _nonIterableSpread()
+  );
+}
+function _nonIterableSpread() {
+  throw new TypeError(
+    'Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.',
+  );
+}
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ('string' == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return (
+      'Object' === t && r.constructor && (t = r.constructor.name),
+      'Map' === t || 'Set' === t
+        ? Array.from(r)
+        : 'Arguments' === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)
+        ? _arrayLikeToArray(r, a)
+        : void 0
+    );
+  }
+}
+function _iterableToArray(r) {
+  if (('undefined' != typeof Symbol && null != r[Symbol.iterator]) || null != r['@@iterator'])
+    return Array.from(r);
+}
+function _arrayWithoutHoles(r) {
+  if (Array.isArray(r)) return _arrayLikeToArray(r);
+}
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
 import { debounce } from 'lodash';
 import { useState, useEffect } from 'react';
 
@@ -21,7 +94,15 @@ var _dataFormat = function dataFormat(root, cb) {
   root.path = _toConsumableArray(path);
   root.show = true;
   cb && cb(root.key, root);
-  for (var i = 0; i < ((_ref = (root === null || root === void 0 ? void 0 : root.children) || []) === null || _ref === void 0 ? void 0 : _ref.length); i++) {
+  for (
+    var i = 0;
+    i <
+    ((_ref = (root === null || root === void 0 ? void 0 : root.children) || []) === null ||
+    _ref === void 0
+      ? void 0
+      : _ref.length);
+    i++
+  ) {
     var _ref;
     _dataFormat(root.children[i], path, cb);
   }
@@ -36,7 +117,15 @@ export var findSameCodePath = function findSameCodePath(root, code) {
       return;
     }
     if (root.code === code) res = root;
-    for (var i = 0; i < ((_ref2 = (root === null || root === void 0 ? void 0 : root.children) || []) === null || _ref2 === void 0 ? void 0 : _ref2.length); i++) {
+    for (
+      var i = 0;
+      i <
+      ((_ref2 = (root === null || root === void 0 ? void 0 : root.children) || []) === null ||
+      _ref2 === void 0
+        ? void 0
+        : _ref2.length);
+      i++
+    ) {
       var _ref2;
       _dfs(root.children[i], code);
     }
@@ -65,7 +154,16 @@ export var preorder = function preorder(root, cb) {
     }
     res.push(root.code || root.key);
     cb && cb(root.key, root);
-    for (var i = 0; i < (root === null || root === void 0 ? void 0 : (_root$children = root.children) === null || _root$children === void 0 ? void 0 : _root$children.length); i++) {
+    for (
+      var i = 0;
+      i <
+      (root === null || root === void 0
+        ? void 0
+        : (_root$children = root.children) === null || _root$children === void 0
+        ? void 0
+        : _root$children.length);
+      i++
+    ) {
       var _root$children;
       _dfs2(root.children[i], res, path, cb);
     }
@@ -107,12 +205,14 @@ export var doSearch = function doSearch() {
       path = node.path;
     var filteredStr = name.toLowerCase() + value.toLowerCase();
     if (filteredStr.includes(fileterKeys.toLowerCase())) {
-      path.filter(function (i) {
-        return !areadyHandled.includes(i);
-      }).map(function (i) {
-        areadyHandled.push(i);
-        flattenTreeMap[i].show = true;
-      });
+      path
+        .filter(function (i) {
+          return !areadyHandled.includes(i);
+        })
+        .map(function (i) {
+          areadyHandled.push(i);
+          flattenTreeMap[i].show = true;
+        });
     } else {
       !areadyHandled.includes(key) && (flattenTreeMap[key].show = false);
     }
@@ -124,15 +224,18 @@ export var useWindowHeight = function useWindowHeight(gap) {
     _useState2 = _slicedToArray(_useState, 2),
     windowHeight = _useState2[0],
     setWindowHeight = _useState2[1];
-  useEffect(function () {
-    var handleResize = debounce(function () {
-      setWindowHeight(window.innerHeight - gap);
-    });
-    window.addEventListener('resize', handleResize);
-    // 清理事件监听器
-    return function () {
-      window.removeEventListener('resize', handleResize);
-    };
-  }, [gap]);
+  useEffect(
+    function () {
+      var handleResize = debounce(function () {
+        setWindowHeight(window.innerHeight - gap);
+      });
+      window.addEventListener('resize', handleResize);
+      // 清理事件监听器
+      return function () {
+        window.removeEventListener('resize', handleResize);
+      };
+    },
+    [gap],
+  );
   return windowHeight;
-};
+};

package/es/AssignModal/index.js

@@ -1,15 +1,105 @@
-import _Drawer from "tntd/es/drawer";
-var _excluded = ["visible", "close", "disabled", "title", "onSubmit"];
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
-import React from "react";
+import _Drawer from 'tntd/es/drawer';
+var _excluded = ['visible', 'close', 'disabled', 'title', 'onSubmit', 'locale'];
+function _extends() {
+  return (
+    (_extends = Object.assign
+      ? Object.assign.bind()
+      : function (n) {
+          for (var e = 1; e < arguments.length; e++) {
+            var t = arguments[e];
+            for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+          }
+          return n;
+        }),
+    _extends.apply(null, arguments)
+  );
+}
+function _slicedToArray(r, e) {
+  return (
+    _arrayWithHoles(r) ||
+    _iterableToArrayLimit(r, e) ||
+    _unsupportedIterableToArray(r, e) ||
+    _nonIterableRest()
+  );
+}
+function _nonIterableRest() {
+  throw new TypeError(
+    'Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.',
+  );
+}
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ('string' == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return (
+      'Object' === t && r.constructor && (t = r.constructor.name),
+      'Map' === t || 'Set' === t
+        ? Array.from(r)
+        : 'Arguments' === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)
+        ? _arrayLikeToArray(r, a)
+        : void 0
+    );
+  }
+}
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
+function _iterableToArrayLimit(r, l) {
+  var t =
+    null == r ? null : ('undefined' != typeof Symbol && r[Symbol.iterator]) || r['@@iterator'];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
+    try {
+      if (((i = (t = t.call(r)).next), 0 === l)) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      (o = !0), (n = r);
+    } finally {
+      try {
+        if (!f && null != t.return && ((u = t.return()), Object(u) !== u)) return;
+      } finally {
+        if (o) throw n;
+      }
+    }
+    return a;
+  }
+}
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+function _objectWithoutProperties(e, t) {
+  if (null == e) return {};
+  var o,
+    r,
+    i = _objectWithoutPropertiesLoose(e, t);
+  if (Object.getOwnPropertySymbols) {
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++)
+      (o = s[r]), t.includes(o) || ({}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]));
+  }
+  return i;
+}
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r)
+    if ({}.hasOwnProperty.call(r, n)) {
+      if (e.includes(n)) continue;
+      t[n] = r[n];
+    }
+  return t;
+}
+import React from 'react';
 import { useState } from 'react';
 import AssignApp from './AssignApp';
 import './index.less';
@@ -22,6 +112,7 @@ var AssignModal = function AssignModal(props) {
     _props$title = props.title,
     title = _props$title === void 0 ? '' : _props$title,
     onSubmit = props.onSubmit,
+    locale = props.locale,
     restProps = _objectWithoutProperties(props, _excluded);
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -30,25 +121,39 @@ 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,
-    maskClosable: disabled,
-    destroyOnClose: true,
-    showFooter: !disabled,
-    okButtonProps: {
-      disabled: disabled
-    }
-  }, /*#__PURE__*/React.createElement(AssignApp, _extends({
-    onChange: function onChange(data) {
-      setAssignData(data);
+  return /*#__PURE__*/ React.createElement(
+    _Drawer,
+    {
+      className: 'modal-assign',
+      title: title,
+      visible: visible,
+      width: 900,
+      onCancel: close,
+      onOk: submit,
+      maskClosable: disabled,
+      destroyOnClose: true,
+      showFooter: !disabled,
+      okButtonProps: {
+        disabled: disabled,
+      },
     },
-    disabled: disabled,
-    lang: (props === null || props === void 0 ? void 0 : props.lang) || cookies.get('lang') || 'cn'
-  }, restProps)));
+    /*#__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: locale,
+        },
+        restProps,
+      ),
+    ),
+  );
 };
-export default AssignModal;
+export default AssignModal;

package/es/index.js

@@ -1,3 +1,3 @@
 import Assign from './AssignModal/AssignApp';
 export { default } from './AssignModal';
-export var AssignApp = Assign;
+export var AssignApp = Assign;

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 = {
@@ -17,7 +36,7 @@ export var zh_CN = {
   numOfApp: '%s 个渠道',
   numOfUser: '%s 个用户',
   enterAppName: '请输入渠道名称',
-  enterUserName: '请输入用户名称'
+  enterUserName: '请输入用户名称',
 };
 export var en_US = {
   authorizesOrgList: 'Organization List',
@@ -36,30 +55,71 @@ export var en_US = {
   numOfApp: '%s Channels',
   numOfUser: '%s Accounts',
   enterAppName: 'Enter Channel name',
-  enterUserName: 'Enter Account 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];
-  for (var _len = arguments.length, params = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-    params[_key - 2] = arguments[_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 > 3 ? _len - 3 : 0), _key = 3;
+    _key < _len;
+    _key++
+  ) {
+    params[_key - 3] = arguments[_key];
+  }
+  var actualParams = params;
+
+  // 如果 locale 不是对象或为 null，则认为是旧的调用方式
+  if (_typeof(locale) !== 'object' || locale === null) {
+    actualLocale = null;
+    actualParams = locale !== undefined ? [locale].concat(params) : params;
   }
-  if (params === null || params === void 0 ? void 0 : params.length) {
-    return params.reduce(function (acc, cur) {
-      return acc.replace(/%s/, cur);
+  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;
 };
 export var getLanguage = function getLanguage() {
-  return cookies.get('lang', {
-    path: '/'
-  }) || 'cn';
+  return (
+    cookies.get('lang', {
+      path: '/',
+    }) || 'cn'
+  );
 };
 export default {
   en_US: en_US,
-  zh_CN: zh_CN
-};
+  zh_CN: zh_CN,
+};

package/package.json

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