@aloudata/aloudata-design 2.13.9 → 2.13.11

package/dist/ConfigProvider/getUserList.d.ts

@@ -38,6 +38,7 @@ export type getUsersByKeywordsType = ((params: string) => Promise<TUser>) | unde
 export type getUserListType = {
     getUsersByIds?: getUsersByIdsType;
     getUsersByKeywords?: getUsersByKeywordsType;
+    getMemberPickerItemMoreInfoKey?: (user: IUser) => string;
 };
 declare const GetUserListContext: React.Context<getUserListType>;
 export interface IGetUserListContextProps {

package/dist/ConfigProvider/hooks/useGetUserList.d.ts

@@ -1,5 +1,6 @@
 declare function useGetUserList(): {
     getUsersByIds: import("../getUserList").getUsersByIdsType;
     getUsersByKeywords: import("../getUserList").getUsersByKeywordsType;
+    getMemberPickerItemMoreInfoKey: ((user: import("../getUserList").IUser) => string) | undefined;
 };
 export default useGetUserList;

package/dist/ConfigProvider/hooks/useGetUserList.js

@@ -3,10 +3,12 @@ import GetUserListContext from "../getUserList";
 function useGetUserList() {
   var _useContext = useContext(GetUserListContext),
     getUsersByIds = _useContext.getUsersByIds,
-    getUsersByKeywords = _useContext.getUsersByKeywords;
+    getUsersByKeywords = _useContext.getUsersByKeywords,
+    getMemberPickerItemMoreInfoKey = _useContext.getMemberPickerItemMoreInfoKey;
   return {
     getUsersByIds: getUsersByIds,
-    getUsersByKeywords: getUsersByKeywords
+    getUsersByKeywords: getUsersByKeywords,
+    getMemberPickerItemMoreInfoKey: getMemberPickerItemMoreInfoKey
   };
 }
 export default useGetUserList;

package/dist/ConfigProvider/index.d.ts

@@ -1,7 +1,7 @@
 import type { ConfigContext, ConfigProviderProps } from 'antd/lib/config-provider';
 import useConfig from 'antd/lib/config-provider/hooks/useConfig';
 import React from 'react';
-import { getUsersByIdsType, getUsersByKeywordsType } from './getUserList';
+import { IUser, getUsersByIdsType, getUsersByKeywordsType } from './getUserList';
 import useGetUserList from './hooks/useGetUserList';
 import SizeContext from './sizeContext';
 export { ConfigContext } from 'antd/lib/config-provider';
@@ -11,6 +11,7 @@ interface AldCustomConfigProviderProps extends ConfigProviderProps {
     children?: React.ReactNode;
     getUsersByIds?: getUsersByIdsType;
     getUsersByKeywords?: getUsersByKeywordsType;
+    getMemberPickerItemMoreInfoKey?: (user: IUser) => string;
 }
 declare const AldCustomConfigProvider: React.FC<AldCustomConfigProviderProps> & {
     /** @private internal Usage. do not use in your production */

package/dist/ConfigProvider/index.js

@@ -13,13 +13,15 @@ var AldCustomConfigProvider = function AldCustomConfigProvider(props) {
   var _props$locale;
   var children = props.children,
     getUsersByIds = props.getUsersByIds,
-    getUsersByKeywords = props.getUsersByKeywords;
+    getUsersByKeywords = props.getUsersByKeywords,
+    getMemberPickerItemMoreInfoKey = props.getMemberPickerItemMoreInfoKey;
   var childNode = children;
   if (getUsersByIds || getUsersByKeywords) {
     childNode = /*#__PURE__*/React.createElement(getUserListContext.Provider, {
       value: {
         getUsersByIds: getUsersByIds,
-        getUsersByKeywords: getUsersByKeywords
+        getUsersByKeywords: getUsersByKeywords,
+        getMemberPickerItemMoreInfoKey: getMemberPickerItemMoreInfoKey
       }
     }, children);
   }

package/dist/LogicTree/index.d.ts

@@ -13,5 +13,6 @@ interface IProps<T> {
     renderCondition: TRenderCondition<T>;
     rootNodeAllowedEmpty?: boolean;
     className?: string;
+    needDndProvider?: boolean;
 }
 export default function LogicTree<T>(props: IProps<T>): React.JSX.Element | null;

package/dist/LogicTree/index.js

@@ -21,7 +21,9 @@ export default function LogicTree(props) {
     propsOnChange = props.onChange,
     renderCondition = props.renderCondition,
     rootNodeAllowedEmpty = props.rootNodeAllowedEmpty,
-    className = props.className;
+    className = props.className,
+    _props$needDndProvide = props.needDndProvider,
+    needDndProvider = _props$needDndProvide === void 0 ? false : _props$needDndProvide;
   var initialNode = {
     id: getUniqId(),
     type: ENodeType.LOGIC,
@@ -109,9 +111,7 @@ export default function LogicTree(props) {
   if (!innerValue) {
     return null;
   }
-  return /*#__PURE__*/React.createElement(DndProvider, {
-    backend: HTML5Backend
-  }, /*#__PURE__*/React.createElement("div", {
+  var content = /*#__PURE__*/React.createElement("div", {
     className: classNames('ald-logic-tree-wrap', className)
   }, /*#__PURE__*/React.createElement(LogicItem, {
     value: innerValue,
@@ -125,5 +125,12 @@ export default function LogicTree(props) {
     hoverId: hoverItemId,
     setHoverId: setHoverItemId,
     isRoot: true // 将最顶层的LogicItem标记为根节点
-  })));
+  }));
+
+  if (!needDndProvider) {
+    return content;
+  }
+  return /*#__PURE__*/React.createElement(DndProvider, {
+    backend: HTML5Backend
+  }, content);
 }

package/dist/LogicTree/style/LoginItem.less

@@ -19,6 +19,7 @@
 
   &.is-hover {
     background: rgba(244, 244, 245);
+    transition: background-color 0.3s ease-in-out;
   }
 
   &.is-dragging {
@@ -104,6 +105,7 @@
     align-items: center;
     border-radius: 6px;
     background: rgba(244, 244, 245);
+    transition: background-color 0.3s ease-in-out;
   }
 
   &.is-dragging {

package/dist/MemberPicker/components/MultipleOption.js

@@ -6,6 +6,7 @@ import classnames from 'classnames';
 import React, { useContext } from 'react';
 import Badge from "../../Badge";
 import Checkbox from "../../Checkbox";
+import ConfigProvider from "../../ConfigProvider";
 import { EUserType } from "../../ConfigProvider/getUserList";
 import TextLink from "../../TextLink/index";
 import { LocaleContext, getTranslator } from "../../locale/default";
@@ -16,6 +17,8 @@ export default function MultipleList(params) {
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
   var t = getTranslator(locale);
+  var _ConfigProvider$useGe = ConfigProvider.useGetUserList(),
+    getMemberPickerItemMoreInfoKey = _ConfigProvider$useGe.getMemberPickerItemMoreInfoKey;
   var disabled = params.disabled,
     user = params.user,
     selected = params.selected,
@@ -49,10 +52,11 @@ export default function MultipleList(params) {
     account: getAccount(user),
     addonBefore: showUserId && user.type === EUserType.USER && /*#__PURE__*/React.createElement("span", {
       className: 'ald-member-picker-option-id'
-    }, user.userId)
+    }, getMemberPickerItemMoreInfoKey ? getMemberPickerItemMoreInfoKey(user) : user.userId)
   }), isUser(user) && user.ban && /*#__PURE__*/React.createElement(Badge, {
     status: "default",
-    count: t.MemberPicker.ban
+    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/components/SelectedMemberTags.js

@@ -2,6 +2,7 @@ import classNames from 'classnames';
 import _ from 'lodash';
 import React, { useContext } from 'react';
 import Badge from "../../Badge";
+import ConfigProvider from "../../ConfigProvider";
 import { CloseMLine } from "../../Icon";
 import ScrollArea from "../../ScrollArea";
 import { LocaleContext, getTranslator } from "../../locale/default";
@@ -14,6 +15,8 @@ export default function SelectedMemberTags(props) {
     width = props.width,
     _props$lockedIds = props.lockedIds,
     lockedIds = _props$lockedIds === void 0 ? [] : _props$lockedIds;
+  var _ConfigProvider$useGe = ConfigProvider.useGetUserList(),
+    memberPickerItemMoreInfoKey = _ConfigProvider$useGe.memberPickerItemMoreInfoKey;
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
   var t = getTranslator(locale);
@@ -56,10 +59,11 @@ export default function SelectedMemberTags(props) {
       account: getAccount(user),
       addonBefore: user.type === 'USER' && /*#__PURE__*/React.createElement("span", {
         className: "ald-member-picker-option-id"
-      }, user.userId)
+      }, user[memberPickerItemMoreInfoKey || 'userId'])
     })), isUser(user) && user.ban && /*#__PURE__*/React.createElement(Badge, {
       status: "default",
-      count: t.MemberPicker.ban
+      count: t.MemberPicker.ban,
+      className: 'ald-member-picker-ban-badge'
     }), !hasLocked && /*#__PURE__*/React.createElement(CloseMLine, {
       size: 20,
       className: 'ald-member-picker-close',

package/dist/MemberPicker/components/SingleOption.js

@@ -5,6 +5,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import classnames from 'classnames';
 import React, { useContext } from 'react';
 import Badge from "../../Badge";
+import ConfigProvider from "../../ConfigProvider";
 import { EUserType } from "../../ConfigProvider/getUserList";
 import TextLink from "../../TextLink/index";
 import { LocaleContext, getTranslator } from "../../locale/default";
@@ -15,6 +16,8 @@ export default function SingleOption(params) {
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
   var t = getTranslator(locale);
+  var _ConfigProvider$useGe = ConfigProvider.useGetUserList(),
+    getMemberPickerItemMoreInfoKey = _ConfigProvider$useGe.getMemberPickerItemMoreInfoKey;
   var disabled = params.disabled,
     user = params.user,
     selected = params.selected,
@@ -45,10 +48,11 @@ export default function SingleOption(params) {
     account: getAccount(user),
     addonBefore: showUserId && user.type === EUserType.USER && /*#__PURE__*/React.createElement("span", {
       className: 'ald-member-picker-option-id'
-    }, user.userId)
+    }, getMemberPickerItemMoreInfoKey ? getMemberPickerItemMoreInfoKey(user) : user.userId)
   }), isUser(user) && user.ban && /*#__PURE__*/React.createElement(Badge, {
     status: "default",
-    count: t.MemberPicker.ban
+    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;
+}