@aloudata/aloudata-design 2.13.8 → 2.13.10

package/dist/MemberPicker/components/SelectedMemberTags.js

@@ -1,19 +1,19 @@
 import classNames from 'classnames';
 import _ from 'lodash';
 import React, { useContext } from 'react';
+import Badge from "../../Badge";
 import { CloseMLine } from "../../Icon";
 import ScrollArea from "../../ScrollArea";
 import { LocaleContext, getTranslator } from "../../locale/default";
 import { getAccount, getId, getPhoto } from "../utils";
+import { isUser } from "../utils/getUsersWithUserId";
 import NickLabel from "./NickLabel";
-import { userDisplayNameIsRepeated } from "./Panel";
 export default function SelectedMemberTags(props) {
   var className = props.className,
     selectedUsers = props.selectedUsers,
     width = props.width,
     _props$lockedIds = props.lockedIds,
-    lockedIds = _props$lockedIds === void 0 ? [] : _props$lockedIds,
-    userList = props.userList;
+    lockedIds = _props$lockedIds === void 0 ? [] : _props$lockedIds;
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
   var t = getTranslator(locale);
@@ -30,7 +30,6 @@ export default function SelectedMemberTags(props) {
     }
   }, selectedUsers.map(function (user) {
     var hasLocked = false;
-    var isDisplayNameRepeat = false;
     if (user && user.hasOwnProperty('groupId')) {
       var index = _.findIndex(lockedIds, {
         groupId: user.groupId,
@@ -42,7 +41,6 @@ export default function SelectedMemberTags(props) {
         userId: user.userId,
         type: user.type
       });
-      isDisplayNameRepeat = userDisplayNameIsRepeated(userList, user.nickname);
       hasLocked = _index !== -1;
     }
     return /*#__PURE__*/React.createElement("div", {
@@ -56,10 +54,14 @@ export default function SelectedMemberTags(props) {
       name: user.name,
       photo: getPhoto(user),
       account: getAccount(user),
-      addonBefore: isDisplayNameRepeat && user.type === 'USER' && /*#__PURE__*/React.createElement("span", {
+      addonBefore: user.type === 'USER' && /*#__PURE__*/React.createElement("span", {
         className: "ald-member-picker-option-id"
       }, user.userId)
-    })), !hasLocked && /*#__PURE__*/React.createElement(CloseMLine, {
+    })), isUser(user) && user.ban && /*#__PURE__*/React.createElement(Badge, {
+      status: "default",
+      count: t.MemberPicker.ban,
+      className: 'ald-member-picker-ban-badge'
+    }), !hasLocked && /*#__PURE__*/React.createElement(CloseMLine, {
       size: 20,
       className: 'ald-member-picker-close',
       color: "#98A2B3",

package/dist/MemberPicker/components/SingleOption.js

@@ -4,11 +4,12 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import classnames from 'classnames';
 import React, { useContext } from 'react';
+import Badge from "../../Badge";
 import { EUserType } from "../../ConfigProvider/getUserList";
 import TextLink from "../../TextLink/index";
 import { LocaleContext, getTranslator } from "../../locale/default";
 import { getAccount, getId, getPhoto } from "../utils";
-import { isUserGroup } from "../utils/getUsersWithUserId";
+import { isUser, isUserGroup } from "../utils/getUsersWithUserId";
 import NickLabel from "./NickLabel";
 export default function SingleOption(params) {
   var _useContext = useContext(LocaleContext),
@@ -45,6 +46,10 @@ export default function SingleOption(params) {
     addonBefore: showUserId && user.type === EUserType.USER && /*#__PURE__*/React.createElement("span", {
       className: 'ald-member-picker-option-id'
     }, user.userId)
+  }), isUser(user) && user.ban && /*#__PURE__*/React.createElement(Badge, {
+    status: "default",
+    count: t.MemberPicker.ban,
+    className: 'ald-member-picker-ban-badge'
   }))), isUserGroup(user) && hasNextLevel && /*#__PURE__*/React.createElement(TextLink, {
     className: "ald-member-picker-btn",
     size: "small",

package/dist/MemberPicker/style/index.less

@@ -7,6 +7,7 @@
 @import '../../message/style/index.less';
 @import '../../Spin/style/index.less';
 @import '../../TextLink/style/index.less';
+@import '../../Badge/style/index.less';
 
 @btnWidth: 30px;
 
@@ -361,3 +362,7 @@
 .ald-member-selected-member-wrapper {
   height: calc(100% - 24px);
 }
+
+.ald-member-picker-ban-badge {
+  flex: 0 0 auto;
+}

package/dist/Switch/index.js

@@ -29,6 +29,7 @@ var Switch = function Switch(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     userChecked = _useState2[0],
     setUserChecked = _useState2[1];
+
   // ===================== Disabled =====================
   var disabled = React.useContext(DisabledContext);
   var mergedDisabled = customDisabled !== null && customDisabled !== void 0 ? customDisabled : disabled;