@aloudata/aloudata-design 2.8.3 → 2.8.5

package/dist/Checkbox/style/index.less

@@ -35,6 +35,17 @@
 
 @checkout-border-radius: var(--alias-radius-25);
 
+.ant-checkbox-group.ald-checkbox-group.ald-checkbox-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+}
+
+.ald-checkout-group-vertical.ant-checkbox-group.ald-checkbox-group.ald-checkbox-group {
+  display: flex;
+  flex-wrap: unset;
+}
+
 .ald-checkout-group-vertical {
   display: flex;
   flex-direction: column;
@@ -55,10 +66,11 @@
   }
 
   &.ant-checkbox-wrapper {
-    height: 20px;
+    min-height: 20px;
     font-weight: 400;
     font-size: 13px;
     line-height: 20px;
+    margin-left: 0 !important;
 
     .ant-checkbox-input {
       margin: 0;

package/dist/Dropdown/index.js

@@ -62,7 +62,10 @@ export default function Dropdown(props) {
       return;
     }
     if (!isOpenControlled) {
-      setDropdownOpen(false);
+      // 修复关闭 dropdown 后，再次点击无法打开 dropdown 的问题，经测试 setTimeout 0 后可以修复
+      setTimeout(function () {
+        setDropdownOpen(false);
+      }, 0);
     }
   }, [isOpenControlled, menu]);
   var onDropdownOpenChange = useCallback(function (isDropdownOpen) {
@@ -97,7 +100,7 @@ export default function Dropdown(props) {
     placement: placement,
     dropdownRender: menuRender,
     destroyPopupOnHide: destroyPopupOnHide,
-    open: isOpenControlled ? open : dropdownOpen,
+    open: !!(isOpenControlled ? open : dropdownOpen),
     onOpenChange: onDropdownOpenChange
   }, antdDropdownProps), children);
 }

package/dist/MemberPicker/components/MemberSelection.js

@@ -66,7 +66,7 @@ export default function MemberSelection(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "ald-member-picker-member-list-inner",
     style: {
-      width: width,
+      width: multiple ? width : undefined,
       overflow: 'hidden'
     }
   }, userList.map(function (user) {

package/dist/MemberPicker/components/SingleOption.d.ts

@@ -1,12 +1,14 @@
 import React from 'react';
 import { IUserGroup } from '../../ConfigProvider/getUserList';
 import { IUser } from '../interface';
-interface ISelectProps {
+interface IMultipleOptionProps {
     selected: boolean;
-    user: IUser | IUserGroup;
-    onChange: (selected: boolean, user: IUser | IUserGroup) => void;
     disabled?: boolean;
+    user: IUser | IUserGroup;
+    onChange?: (selected: boolean, user: IUser | IUserGroup) => void;
     className?: string;
+    onNextLevel?: (userGroup: IUserGroup) => void;
+    hasNextLevel?: boolean;
 }
-export default function SingleOption(params: ISelectProps): React.JSX.Element;
+export default function SingleOption(params: IMultipleOptionProps): React.JSX.Element;
 export {};

package/dist/MemberPicker/components/SingleOption.js

@@ -4,27 +4,42 @@ 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 from 'react';
+import TextLink from "../../TextLink/index";
 import { getAccount, getId, getPhoto } from "../utils";
+import { isUserGroup } from "../utils/getUsersWithUserId";
 import NickLabel from "./NickLabel";
 export default function SingleOption(params) {
   var disabled = params.disabled,
-    selected = params.selected,
     user = params.user,
-    _params$onChange = params.onChange,
-    onChange = _params$onChange === void 0 ? function () {} : _params$onChange,
-    className = params.className;
+    selected = params.selected,
+    onChange = params.onChange,
+    className = params.className,
+    onNextLevel = params.onNextLevel,
+    _params$hasNextLevel = params.hasNextLevel,
+    hasNextLevel = _params$hasNextLevel === void 0 ? true : _params$hasNextLevel;
   var onClick = function onClick() {
     if (disabled) return;
-    onChange(!selected, user);
+    onChange === null || onChange === void 0 ? void 0 : onChange(!selected, user);
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: classnames('ald-member-picker-option', className, 'ald-member-picker-singleOption', _defineProperty({}, 'ald-member-picker-single-option-selected', selected)),
+    className: classnames('ald-member-picker-option', className, _defineProperty({}, 'ald-member-picker-option-disabled', disabled)),
     onClick: onClick
+  }, /*#__PURE__*/React.createElement("div", {
+    className: 'ald-member-picker-label'
   }, /*#__PURE__*/React.createElement(NickLabel, {
     type: user.type,
     id: getId(user),
     name: user.name,
     photo: getPhoto(user),
     account: getAccount(user)
-  }));
+  })), isUserGroup(user) && hasNextLevel && /*#__PURE__*/React.createElement(TextLink, {
+    className: "ald-member-picker-btn",
+    size: "small",
+    disabled: disabled,
+    onClick: function onClick(e) {
+      onNextLevel === null || onNextLevel === void 0 ? void 0 : onNextLevel(user);
+      e.stopPropagation();
+      e.preventDefault();
+    }
+  }, "\u4E0B\u7EA7"));
 }

package/dist/MemberPicker/components/UserGroupSelection.js

@@ -115,7 +115,7 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "ald-member-picker-member-list-inner",
     style: {
-      width: width,
+      width: multiple ? width : undefined,
       overflow: 'hidden'
     }
   }, filterUserList.map(function (userGroup) {
@@ -147,11 +147,19 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
     }) : /*#__PURE__*/React.createElement(SingleOption, {
       key: userGroup.groupId,
       user: userGroup,
+      disabled: disabled,
       selected: isSelected,
       onChange: function onChange(selected, userGroup) {
         if (isUserGroup(userGroup)) {
           _onChange(selected, userGroup);
         }
+      },
+      hasNextLevel: userGroupList.some(function (group) {
+        return group.parentId === userGroup.groupId;
+      }),
+      onNextLevel: function onNextLevel(userGroup) {
+        setGroupPath(getPath(userGroup));
+        setSearchKey('');
       }
     });
   })))));

package/dist/MemberPicker/index.js

@@ -1,6 +1,10 @@
 var _excluded = ["value", "type", "onChange", "multiple", "dropdownWidth", "open", "onOpenChange", "placeholder", "className", "allowClear", "disabled", "onClear", "size", "selectType", "prefix", "lockedIds"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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."); }
@@ -144,7 +148,29 @@ var Component = function Component(_ref) {
         param = value;
       }
       queryByIds(param).then(function (result) {
-        setSelectedUserList(result);
+        // 如果用户已被删除，则需要展示出id
+        var valueNotInResult = param.filter(function (item) {
+          if (item.type === EUserType.USER) {
+            return result.filter(isUser).every(function (user) {
+              return user.userId !== item.userId;
+            });
+          }
+          return result.filter(isUserGroup).every(function (user) {
+            return user.groupId !== item.groupId;
+          });
+        }).map(function (item) {
+          if (item.type === EUserType.USER) {
+            return {
+              type: EUserType.USER,
+              userId: item.userId
+            };
+          }
+          return {
+            type: EUserType.USER_GROUP,
+            groupId: item.groupId
+          };
+        });
+        setSelectedUserList([].concat(_toConsumableArray(result), _toConsumableArray(valueNotInResult)));
       });
     }
   }, [value, queryByIds]);
@@ -224,23 +250,23 @@ var Component = function Component(_ref) {
     mode: multiple ? 'multiple' : undefined,
     options: selectedUserList.map(function (item) {
       if (item.type === EUserType.USER_GROUP) return {
-        label: item.name,
+        label: item.name || item.groupId,
         value: item.groupId,
         tag: /*#__PURE__*/React.createElement("div", {
           className: 'ald-member-picker-tag'
         }, /*#__PURE__*/React.createElement(UserGroup, {
           size: 20
-        }), item.name)
+        }), item.name || item.groupId)
       };
       return {
-        label: item.nickname || item.name,
+        label: item.nickname || item.name || item.userId,
         value: item.userId,
         tag: /*#__PURE__*/React.createElement("div", {
           className: 'ald-member-picker-tag'
         }, /*#__PURE__*/React.createElement(Avatar, {
           size: 20,
           src: item.photo
-        }), item.nickname || item.name)
+        }), item.nickname || item.name || item.userId)
       };
     }),
     optionLabelProp: multiple ? 'label' : 'tag',