@aloudata/aloudata-design 2.14.4 → 2.14.6

package/dist/LogicTree/components/LogicItem/index.js

@@ -13,7 +13,7 @@ import DragLightLine from "../../../Icon/components/DragLightLine";
 import PlusIcon from "../../../Icon/components/SignLightLine";
 import TrashLightLine from "../../../Icon/components/TrashLightLine";
 import IconButton from "../../../IconButton";
-import Select from "../../../Select";
+import AldSelect from "../../../AldSelect";
 import TextLink from "../../../TextLink";
 import { LocaleContext, getTranslator } from "../../../locale/default";
 import { ELogicType, ENodeType } from "../../type";
@@ -260,10 +260,11 @@ export default function LogicItem(_ref) {
       size: 16,
       color: "#374151",
       className: "ald-logic-tree-node-drag-icon"
-    })), /*#__PURE__*/React.createElement(Select, {
+    })), /*#__PURE__*/React.createElement(AldSelect, {
       options: logicOptions,
       className: "ald-logic-tree-select-relation",
       size: "small",
+      popupMatchSelectWidth: false,
       value: _logicType,
       onChange: onChangeRelation,
       disabled: nodes.length <= 1

package/dist/LogicTree/style/index.less

@@ -1,6 +1,6 @@
 @import '../../TextLink/style/index.less';
 @import '../../IconButton/style/index.less';
-@import '../../Select/style/index.less';
+@import '../../AldSelect/style/index.less';
 @import './DisplayLogicItem.less';
 @import './LoginItem.less';
 

package/dist/MemberPicker/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "type", "onChange", "multiple", "dropdownWidth", "open", "onOpenChange", "placeholder", "className", "allowClear", "disabled", "onClear", "size", "selectType", "prefix", "lockedIds", "footer", "onCancel"];
+var _excluded = ["value", "type", "onChange", "multiple", "dropdownWidth", "open", "onOpenChange", "placeholder", "className", "allowClear", "disabled", "onClear", "size", "prefix", "lockedIds", "footer", "onCancel"];
 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(); }
@@ -22,13 +22,13 @@ import Avatar from "../Avatar";
 import ConfigProvider from "../ConfigProvider";
 import { EUserType } from "../ConfigProvider/getUserList";
 import { UserGroup } from "../Icon";
-import Select from "../Select";
 import { LocaleContext, getTranslator } from "../locale/default";
 import message from "../message";
 import Panel from "./components/Panel";
 import MemberPanel from "./components/PanelWrapper";
 import { EMemberPicker } from "./interface";
 import { isUser, isUserGroup } from "./utils/getUsersWithUserId";
+import AldSelect from "../AldSelect";
 var Component = function Component(props) {
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
@@ -36,7 +36,7 @@ var Component = function Component(props) {
   var value = props.value,
     _props$type = props.type,
     type = _props$type === void 0 ? EMemberPicker.USER : _props$type,
-    onChange = props.onChange,
+    _onChange = props.onChange,
     multiple = props.multiple,
     dropdownWidth = props.dropdownWidth,
     open = props.open,
@@ -48,8 +48,6 @@ var Component = function Component(props) {
     disabled = props.disabled,
     _onClear = props.onClear,
     size = props.size,
-    _props$selectType = props.selectType,
-    selectType = _props$selectType === void 0 ? 'secondary' : _props$selectType,
     propPrefix = props.prefix,
     _props$lockedIds = props.lockedIds,
     lockedIds = _props$lockedIds === void 0 ? [] : _props$lockedIds,
@@ -187,13 +185,13 @@ var Component = function Component(props) {
   var onSelectedChange = useCallback(function (users) {
     if (multiple) {
       setSelectedUserList(users);
-      onChange === null || onChange === void 0 ? void 0 : onChange(users);
+      _onChange === null || _onChange === void 0 ? void 0 : _onChange(users);
     } else {
       setSelectedUserList(users);
-      onChange === null || onChange === void 0 ? void 0 : onChange(users[0]);
+      _onChange === null || _onChange === void 0 ? void 0 : _onChange(users[0]);
     }
     setDropdownOpen(false);
-  }, [multiple, onChange, setDropdownOpen]);
+  }, [multiple, _onChange, setDropdownOpen]);
   useEffect(function () {
     if (typeof open === 'boolean') {
       setDropdownOpen(open);
@@ -234,11 +232,19 @@ var Component = function Component(props) {
       return _.sampleSize('abcdefghijklmnopqrstuvwxyz0123456789', 8).join('');
     }
   }, [dropdownOpen]);
-  return /*#__PURE__*/React.createElement(Select, _extends({
+  var mode = useMemo(function () {
+    if (multiple === true) {
+      return {
+        type: 'multiple',
+        responsive: true
+      };
+    }
+    return multiple ? multiple : undefined;
+  }, [multiple]);
+  return /*#__PURE__*/React.createElement(AldSelect, _extends({
     prefix: propPrefix
   }, restProps, {
     size: size,
-    type: selectType,
     className: classNames('ald-member-picker-select', className),
     value: selectedUserList.map(function (item) {
       if (item.type === EUserType.USER_GROUP) {
@@ -247,19 +253,58 @@ var Component = function Component(props) {
         return item.userId;
       }
     }),
+    onChange: function onChange(value) {
+      if (_.isEmpty(value)) {
+        setSelectedUserList([]);
+        if (multiple) {
+          _onChange === null || _onChange === void 0 ? void 0 : _onChange([]);
+        } else {
+          _onChange === null || _onChange === void 0 ? void 0 : _onChange();
+        }
+      } else {
+        var valueList = Array.isArray(value) ? value : [value];
+        if (multiple) {
+          var users = valueList.map(function (item) {
+            var user = totalUserList.find(function (user) {
+              if (user.type === EUserType.USER) {
+                return user.userId === item;
+              }
+              return user.groupId === item;
+            });
+            return user;
+          }).filter(Boolean);
+          setSelectedUserList(users);
+          _onChange === null || _onChange === void 0 ? void 0 : _onChange(users);
+        } else {
+          var user = totalUserList.find(function (user) {
+            if (user.type === EUserType.USER) {
+              return user.userId === value;
+            }
+            return user.groupId === value;
+          });
+          if (user) {
+            setSelectedUserList([user]);
+            _onChange === null || _onChange === void 0 ? void 0 : _onChange(user);
+          } else {
+            setSelectedUserList([]);
+            _onChange === null || _onChange === void 0 ? void 0 : _onChange();
+          }
+        }
+      }
+    },
     disabled: disabled,
     allowClear: allowClear,
     onClear: function onClear() {
       setSelectedUserList([]);
       if (multiple) {
-        onChange === null || onChange === void 0 ? void 0 : onChange([]);
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange([]);
       } else {
-        onChange === null || onChange === void 0 ? void 0 : onChange();
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange();
       }
       _onClear === null || _onClear === void 0 ? void 0 : _onClear();
     },
     popupClassName: "ald-member-picker-popup",
-    mode: multiple ? 'multiple' : undefined,
+    mode: mode,
     options: selectedUserList.map(function (item) {
       if (item.type === EUserType.USER_GROUP) return {
         label: item.name || item.groupId,
@@ -283,8 +328,8 @@ var Component = function Component(props) {
     }),
     optionLabelProp: multiple ? 'label' : 'tag',
     open: dropdownOpen,
-    onDropdownVisibleChange: onDropdownOpenChange,
-    dropdownMatchSelectWidth: false,
+    onOpenChange: onDropdownOpenChange,
+    popupMatchSelectWidth: false,
     placeholder: placeholder,
     dropdownRender: function dropdownRender() {
       return /*#__PURE__*/React.createElement("div", {
@@ -295,7 +340,7 @@ var Component = function Component(props) {
         value: selectedUserList,
         dataList: totalUserList,
         lockedIds: lockedIds,
-        multiple: multiple,
+        multiple: !!multiple,
         key: panelKey,
         loading: loading,
         dropdownWidth: dropdownContentWidth,

package/dist/MemberPicker/interface.d.ts

@@ -1,7 +1,8 @@
 import { ReactNode } from 'react';
 import { IUser, IUserGroup, TUser } from '../ConfigProvider/getUserList';
-import { ISelectProps } from '../Select';
+import { ISelectProps } from '../AldSelect/interface';
 import { RequiredProperties } from '../_utils/type';
+import { Mode } from '../AldSelect/BaseSelect';
 export type TUserValue = RequiredProperties<IUser, 'type' | 'userId'>;
 export type TUserGroupValue = RequiredProperties<IUserGroup, 'type' | 'groupId'>;
 export type TMemberPickerValue = TUserValue | TUserGroupValue | Array<TUserValue | TUserGroupValue>;
@@ -16,13 +17,12 @@ export interface IBaseMemberSelectorProps extends Omit<ISelectProps, 'type'> {
     open?: boolean;
     onOpenChange?: (open: boolean) => void;
     type?: EMemberPicker;
-    selectType?: ISelectProps['type'];
     lockedIds?: Array<TUserValue | TUserGroupValue>;
     footer?: ReactNode;
     onCancel?: () => void;
 }
 export interface IMultipleMemberSelectorProps extends IBaseMemberSelectorProps {
-    multiple: true;
+    multiple: true | Mode;
     onChange?(v: TUser): void;
 }
 export interface ISingleMemberSelectorProps extends IBaseMemberSelectorProps {

package/dist/MemberPicker/style/index.less

@@ -1,5 +1,5 @@
 @import '../../style/index.less';
-@import '../../Select/style/index.less';
+@import '../../AldSelect/style/index.less';
 @import '../../Input/style/index.less';
 @import '../../Avatar/style/index.less';
 @import '../../ScrollArea/style/index.less';
@@ -342,10 +342,10 @@
   align-items: center;
 }
 
-.ald-select-popup.ald-member-picker-popup.ald-member-picker-popup.ald-member-picker-popup {
+.beta-ald-select-popup-container.ald-member-picker-popup {
   border: none;
   overflow: hidden;
-  padding: 0;
+  padding: 0 !important;
   border-radius: 0;
   border-radius: 4px;
   background: var(--colors-neutral-white, #fff);