@aloudata/aloudata-design 2.19.0 → 2.19.1

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

@@ -11,6 +11,12 @@ interface IMemberSelectionProps {
     width: number;
     filterItem?: (item: IUser) => boolean;
     lockedIds: Array<TUserValue | TUserGroupValue>;
+    renderItem?: (item: IUser, context: {
+        isSelected: boolean;
+        disabled: boolean;
+        onClick: () => void;
+        originNode: React.ReactNode;
+    }) => React.ReactNode;
 }
 export declare const OPTION_HEIGHT = 36;
 export declare const WRAPPER_HEIGHT = 300;

package/dist/MemberPicker/components/MemberSelection.js

@@ -31,7 +31,8 @@ export default function MemberSelection(props) {
     loading = props.loading,
     width = props.width,
     lockedIds = props.lockedIds,
-    filterItem = props.filterItem;
+    filterItem = props.filterItem,
+    renderItem = props.renderItem;
   var filteredList = useMemo(function () {
     return userList.filter(function (item) {
       if (filterItem) {
@@ -114,17 +115,7 @@ export default function MemberSelection(props) {
       type: user.type
     });
     var disabled = index !== -1;
-    return /*#__PURE__*/React.createElement("div", {
-      key: virtualItem.key,
-      style: {
-        position: 'absolute',
-        top: 0,
-        left: 0,
-        width: '100%',
-        height: "".concat(virtualItem.size, "px"),
-        transform: "translateY(".concat(virtualItem.start, "px)")
-      }
-    }, multiple ? /*#__PURE__*/React.createElement(MultipleOption, {
+    var originNode = multiple ? /*#__PURE__*/React.createElement(MultipleOption, {
       key: user.userId,
       user: user,
       disabled: disabled,
@@ -141,6 +132,39 @@ export default function MemberSelection(props) {
       onChange: function onChange(selected, user) {
         if (isUser(user)) _onChange(selected, user);
       }
-    }));
+    });
+    if (renderItem) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: virtualItem.key,
+        style: {
+          position: 'absolute',
+          top: 0,
+          left: 0,
+          width: '100%',
+          height: "".concat(virtualItem.size, "px"),
+          transform: "translateY(".concat(virtualItem.start, "px)")
+        }
+      }, renderItem(user, {
+        isSelected: isSelected,
+        disabled: disabled,
+        onClick: function onClick() {
+          if (!disabled) {
+            _onChange(!isSelected, user);
+          }
+        },
+        originNode: originNode
+      }));
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      key: virtualItem.key,
+      style: {
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        width: '100%',
+        height: "".concat(virtualItem.size, "px"),
+        transform: "translateY(".concat(virtualItem.start, "px)")
+      }
+    }, originNode);
   })))));
 }

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

@@ -14,6 +14,14 @@ interface IPanelProps {
     className?: string;
     lockedIds: Array<TUserValue | TUserGroupValue>;
     footer?: ReactNode;
+    renderItem?: (item: IUser | IUserGroup, context: {
+        isSelected: boolean;
+        disabled: boolean;
+        onClick: () => void;
+        onNextLevel?: () => void;
+        originNode: ReactNode;
+    }) => ReactNode;
+    renderSelectedTag?: (user: IUser | IUserGroup, originNode: ReactNode) => ReactNode;
 }
 export declare const userDisplayNameIsRepeated: (userList: TUser, displayName?: string) => boolean;
 export default function Panel(props: IPanelProps): React.JSX.Element;

package/dist/MemberPicker/components/Panel.js

@@ -44,7 +44,9 @@ export default function Panel(props) {
     className = props.className,
     lockedIds = props.lockedIds,
     footer = props.footer,
-    onCancel = props.onCancel;
+    onCancel = props.onCancel,
+    renderItem = props.renderItem,
+    renderSelectedTag = props.renderSelectedTag;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectedUsers = _useState2[0],
@@ -101,7 +103,8 @@ export default function Panel(props) {
       onSearchValueChange: onSearchValueChange,
       multiple: true,
       lockedIds: lockedIds,
-      loading: props.loading
+      loading: props.loading,
+      renderItem: renderItem
     });
     var userGroupSelection = /*#__PURE__*/React.createElement(UserGroupSelection, {
       className: 'ald-member-picker-member-selection-multiple',
@@ -112,7 +115,8 @@ export default function Panel(props) {
       onSearchValueChange: onSearchValueChange,
       multiple: true,
       lockedIds: lockedIds,
-      loading: props.loading
+      loading: props.loading,
+      renderItem: renderItem
     });
     if (type === EMemberPicker.USER) {
       return userSelection;
@@ -136,7 +140,7 @@ export default function Panel(props) {
         className: "ald-member-tabs"
       });
     }
-  }, [t, dataList, panelwidth, selectedUsers, onSelectionChange, onSearchValueChange, lockedIds, props.loading, type]);
+  }, [t, dataList, panelwidth, selectedUsers, onSelectionChange, onSearchValueChange, lockedIds, props.loading, type, renderItem]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(className, 'ald-member-picker-wrapper', (_classNames = {}, _defineProperty(_classNames, 'ald-member-picker-multiple', multiple), _defineProperty(_classNames, 'ald-member-picker-single', !multiple), _classNames)),
     style: {
@@ -150,7 +154,8 @@ export default function Panel(props) {
     width: (panelwidth - 3) / 2,
     onRemove: onRemove,
     lockedIds: lockedIds,
-    userList: dataList
+    userList: dataList,
+    renderSelectedTag: renderSelectedTag
   }), /*#__PURE__*/React.createElement(SelectorFooter, {
     className: 'ald-member-picker-selector-footer',
     onCancel: onCancel,
@@ -167,7 +172,8 @@ export default function Panel(props) {
     onSearchValueChange: onSearchValueChange,
     multiple: false && multiple,
     lockedIds: lockedIds,
-    loading: props.loading
+    loading: props.loading,
+    renderItem: renderItem
   }), type === EMemberPicker.GROUP && /*#__PURE__*/React.createElement(UserGroupSelection, {
     className: 'ald-member-picker-member-selection-multiple',
     userGroupList: dataList.filter(isUserGroup),
@@ -177,6 +183,7 @@ export default function Panel(props) {
     onSearchValueChange: onSearchValueChange,
     multiple: false,
     lockedIds: lockedIds,
-    loading: props.loading
+    loading: props.loading,
+    renderItem: renderItem
   })));
 }

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

@@ -12,6 +12,14 @@ interface IProps {
     lockedIds?: Array<TUserValue | TUserGroupValue>;
     showUserId?: boolean;
     footer?: ReactNode;
+    renderItem?: (item: IUser | IUserGroup, context: {
+        isSelected: boolean;
+        disabled: boolean;
+        onClick: () => void;
+        onNextLevel?: () => void;
+        originNode: ReactNode;
+    }) => ReactNode;
+    renderSelectedTag?: (user: IUser | IUserGroup, originNode: ReactNode) => ReactNode;
 }
-export declare const PanelWrapper: ({ type, value, multiple, dropdownWidth, onChange, onCancel, className, footer, lockedIds, }: IProps) => React.JSX.Element;
+export declare const PanelWrapper: ({ type, value, multiple, dropdownWidth, onChange, onCancel, className, footer, lockedIds, renderItem, renderSelectedTag, }: IProps) => React.JSX.Element;
 export default PanelWrapper;

package/dist/MemberPicker/components/PanelWrapper.js

@@ -24,7 +24,9 @@ export var PanelWrapper = function PanelWrapper(_ref) {
     className = _ref.className,
     footer = _ref.footer,
     _ref$lockedIds = _ref.lockedIds,
-    lockedIds = _ref$lockedIds === void 0 ? [] : _ref$lockedIds;
+    lockedIds = _ref$lockedIds === void 0 ? [] : _ref$lockedIds,
+    renderItem = _ref.renderItem,
+    renderSelectedTag = _ref.renderSelectedTag;
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
   var t = getTranslator(locale);
@@ -136,7 +138,9 @@ export var PanelWrapper = function PanelWrapper(_ref) {
     className: className,
     onCancel: onCancel,
     lockedIds: lockedIds,
-    footer: footer
+    footer: footer,
+    renderItem: renderItem,
+    renderSelectedTag: renderSelectedTag
   });
 };
 export default PanelWrapper;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { IUserGroup, TUser, TUserGroupValue, TUserValue } from '../../ConfigProvider/getUserList';
 import { IUser } from '../interface';
 interface ISelectedMemberTagsProps {
@@ -8,6 +8,7 @@ interface ISelectedMemberTagsProps {
     width: number;
     lockedIds: Array<TUserValue | TUserGroupValue>;
     userList: TUser;
+    renderSelectedTag?: (user: IUser | IUserGroup, originNode: ReactNode) => ReactNode;
 }
 export default function SelectedMemberTags(props: ISelectedMemberTagsProps): React.JSX.Element;
 export {};

package/dist/MemberPicker/components/SelectedMemberTags.js

@@ -14,7 +14,8 @@ export default function SelectedMemberTags(props) {
     selectedUsers = props.selectedUsers,
     width = props.width,
     _props$lockedIds = props.lockedIds,
-    lockedIds = _props$lockedIds === void 0 ? [] : _props$lockedIds;
+    lockedIds = _props$lockedIds === void 0 ? [] : _props$lockedIds,
+    renderSelectedTag = props.renderSelectedTag;
   var _ConfigProvider$useGe = ConfigProvider.useGetUserList(),
     getMemberPickerItemMoreInfoKey = _ConfigProvider$useGe.getMemberPickerItemMoreInfoKey;
   var _useContext = useContext(LocaleContext),
@@ -46,7 +47,7 @@ export default function SelectedMemberTags(props) {
       });
       hasLocked = _index !== -1;
     }
-    return /*#__PURE__*/React.createElement("div", {
+    var originNode = /*#__PURE__*/React.createElement("div", {
       className: 'ald-member-picker-selected-member-tag',
       key: getId(user)
     }, /*#__PURE__*/React.createElement("div", {
@@ -73,5 +74,9 @@ export default function SelectedMemberTags(props) {
         (_props$onRemove = props.onRemove) === null || _props$onRemove === void 0 ? void 0 : _props$onRemove.call(props, user);
       }
     }));
+    if (renderSelectedTag) {
+      return renderSelectedTag(user, originNode);
+    }
+    return originNode;
   }))));
 }

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

@@ -11,6 +11,13 @@ interface IProps {
     width: number;
     lockedIds: Array<TUserValue | TUserGroupValue>;
     filterItem?: (item: IUserGroup) => boolean;
+    renderItem?: (item: IUserGroup, context: {
+        isSelected: boolean;
+        disabled: boolean;
+        onClick: () => void;
+        onNextLevel?: () => void;
+        originNode: React.ReactNode;
+    }) => React.ReactNode;
 }
-declare const UserGroupSelection: ({ className, userGroupList, multiple, onChange, selectedUsersGroup: selectedUsersGroups, loading, width, lockedIds, filterItem, }: IProps) => React.JSX.Element;
+declare const UserGroupSelection: ({ className, userGroupList, multiple, onChange, selectedUsersGroup: selectedUsersGroups, loading, width, lockedIds, filterItem, renderItem, }: IProps) => React.JSX.Element;
 export default UserGroupSelection;

package/dist/MemberPicker/components/UserGroupSelection.js

@@ -35,7 +35,8 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
     loading = _ref.loading,
     width = _ref.width,
     lockedIds = _ref.lockedIds,
-    filterItem = _ref.filterItem;
+    filterItem = _ref.filterItem,
+    renderItem = _ref.renderItem;
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
   var t = getTranslator(locale);
@@ -174,7 +175,16 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
       type: userGroup.type
     });
     var disabled = index !== -1;
-    return multiple ? /*#__PURE__*/React.createElement(MultipleOption, {
+    var hasNextLevel = userGroupList.some(function (group) {
+      return group.parentId === userGroup.groupId;
+    }) || isAsync;
+    var onNextLevel = function onNextLevel() {
+      setGroupPath(function (prev) {
+        return [].concat(_toConsumableArray(prev), [userGroup]);
+      });
+      setSearchKey('');
+    };
+    var originNode = multiple ? /*#__PURE__*/React.createElement(MultipleOption, {
       key: userGroup.groupId,
       user: userGroup,
       disabled: disabled,
@@ -184,15 +194,8 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
           _onChange(selected, userGroup);
         }
       },
-      hasNextLevel: userGroupList.some(function (group) {
-        return group.parentId === userGroup.groupId;
-      }) || isAsync,
-      onNextLevel: function onNextLevel(userGroup) {
-        setGroupPath(function (prev) {
-          return [].concat(_toConsumableArray(prev), [userGroup]);
-        });
-        setSearchKey('');
-      }
+      hasNextLevel: hasNextLevel,
+      onNextLevel: onNextLevel
     }) : /*#__PURE__*/React.createElement(SingleOption, {
       key: userGroup.groupId,
       user: userGroup,
@@ -203,16 +206,25 @@ var UserGroupSelection = function UserGroupSelection(_ref) {
           _onChange(selected, userGroup);
         }
       },
-      hasNextLevel: userGroupList.some(function (group) {
-        return group.parentId === userGroup.groupId;
-      }) || isAsync,
-      onNextLevel: function onNextLevel(userGroup) {
-        setGroupPath(function (prev) {
-          return [].concat(_toConsumableArray(prev), [userGroup]);
-        });
-        setSearchKey('');
-      }
+      hasNextLevel: hasNextLevel,
+      onNextLevel: onNextLevel
     });
+    if (renderItem) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: userGroup.groupId
+      }, renderItem(userGroup, {
+        isSelected: isSelected,
+        disabled: disabled,
+        onClick: function onClick() {
+          if (isUserGroup(userGroup) && !disabled) {
+            _onChange(!isSelected, userGroup);
+          }
+        },
+        onNextLevel: hasNextLevel ? onNextLevel : undefined,
+        originNode: originNode
+      }));
+    }
+    return originNode;
   })))));
 };
 export default UserGroupSelection;

package/dist/MemberPicker/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "type", "onChange", "multiple", "dropdownWidth", "open", "onOpenChange", "placeholder", "className", "allowClear", "disabled", "onClear", "size", "prefix", "lockedIds", "footer", "onCancel", "filterItem", "mode"];
+var _excluded = ["value", "type", "onChange", "multiple", "dropdownWidth", "open", "onOpenChange", "placeholder", "className", "allowClear", "disabled", "onClear", "size", "prefix", "lockedIds", "footer", "onCancel", "filterItem", "mode", "renderItem", "renderSelectedTag"];
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -60,6 +60,8 @@ var Component = function Component(props) {
     _onCancel = props.onCancel,
     filterItem = props.filterItem,
     propsMode = props.mode,
+    renderItem = props.renderItem,
+    renderSelectedTag = props.renderSelectedTag,
     restProps = _objectWithoutProperties(props, _excluded);
   var _ConfigProvider$useGe = ConfigProvider.useGetUserList(),
     getUsersByIds = _ConfigProvider$useGe.getUsersByIds,
@@ -368,7 +370,9 @@ var Component = function Component(props) {
         onCancel: function onCancel() {
           _onCancel === null || _onCancel === void 0 ? void 0 : _onCancel();
           setDropdownOpen(false);
-        }
+        },
+        renderItem: renderItem,
+        renderSelectedTag: renderSelectedTag
       }));
     }
   }));

package/dist/MemberPicker/interface.d.ts

@@ -21,6 +21,14 @@ export interface IBaseMemberSelectorProps extends Omit<ISelectProps, 'type'> {
     footer?: ReactNode;
     onCancel?: () => void;
     filterItem?: (item: IUser | IUserGroup) => boolean;
+    renderItem?: (item: IUser | IUserGroup, context: {
+        isSelected: boolean;
+        disabled: boolean;
+        onClick: () => void;
+        onNextLevel?: () => void;
+        originNode: ReactNode;
+    }) => ReactNode;
+    renderSelectedTag?: (user: IUser | IUserGroup, originNode: ReactNode) => ReactNode;
 }
 export interface IMultipleMemberSelectorProps extends IBaseMemberSelectorProps {
     multiple: true | Mode;

package/dist/Table/components/DndWrapper.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+/**
+ * DndWrapper 组件：智能检测并处理 DndProvider
+ * 如果外部已存在 DndProvider，则直接复用，避免嵌套冲突
+ * 如果外部不存在 DndProvider，则创建新的
+ */
+declare const DndWrapper: React.FC<{
+    children: React.ReactNode;
+}>;
+export default DndWrapper;

package/dist/Table/components/DndWrapper.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import { DndProvider, useDragDropManager } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
+
+// 内部组件用于检测 DndProvider
+var DndContextDetector = function DndContextDetector(_ref) {
+  var children = _ref.children;
+  // 使用 useDragDropManager 检测是否已有 DndProvider
+  var hasContext = false;
+  try {
+    var manager = useDragDropManager();
+    hasContext = !!manager;
+  } catch (error) {
+    // 如果抛出错误，说明外部没有 DndProvider
+    hasContext = false;
+  }
+
+  // 如果已有上下文，直接返回 children
+  if (hasContext) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, children);
+  }
+
+  // 否则创建新的 DndProvider
+  return /*#__PURE__*/React.createElement(DndProvider, {
+    backend: HTML5Backend
+  }, children);
+};
+
+/**
+ * DndWrapper 组件：智能检测并处理 DndProvider
+ * 如果外部已存在 DndProvider，则直接复用，避免嵌套冲突
+ * 如果外部不存在 DndProvider，则创建新的
+ */
+var DndWrapper = function DndWrapper(_ref2) {
+  var children = _ref2.children;
+  return /*#__PURE__*/React.createElement(DndContextDetector, null, children);
+};
+export default DndWrapper;

package/dist/Table/hooks/useRowDnd.js

@@ -13,6 +13,8 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { getEmptyImage } from 'react-dnd-html5-backend';
 import { getRowKey, hasFixedLeftColumn, prefixCls } from "../helper";
+import _ from 'lodash';
+
 // 定义拖拽项类型
 var ROW_DND_TYPE = 'ALD_TABLE_ROW_DND_TYPE';
 // 拖拽手柄组件
@@ -136,7 +138,7 @@ export default function useRowDnd(props) {
   }, []);
 
   // 当拖拽过程中，临时存储数据
-  var _useState3 = useState(data),
+  var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     draggingTempData = _useState4[0],
     setDraggingTempData = _useState4[1];
@@ -210,20 +212,27 @@ export default function useRowDnd(props) {
   // 记录拖动开始
   var handleDragStart = function handleDragStart(id) {
     setDraggingRowId(id);
+    setDraggingTempData(_.cloneDeep(data));
   };
 
   // 记录拖动结束
   var handleDragComplete = function handleDragComplete() {
+    // 必须在清空 draggingRowId 之前先找到 draggingRow
+    // 因为 tableData 依赖 draggingRowId，清空后 tableData 会切换回原始 data
     var draggingRow = tableData.find(function (item) {
       return getRowKey(item, rowKey) === draggingRowId;
     });
-    setDraggingRowId(null);
     if (!draggingRow) {
       // 不应该出现这种情况
       console.error('draggingRow is not found');
+      setDraggingRowId(null);
       return;
     }
-    onChange(tableData, draggingRow);
+    // 保存当前的 tableData，因为清空 draggingRowId 后 tableData 会变化
+    var finalData = tableData;
+    setDraggingRowId(null);
+    setDraggingTempData([]);
+    onChange(finalData, draggingRow);
   };
   var dndColumn = {
     dataIndex: '',

package/dist/Table/index.js

@@ -17,10 +17,9 @@ import _ from 'lodash';
 import ResizeObserver from 'rc-resize-observer';
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useState } from 'react';
 import { Empty, Spin } from '..';
-import { DndProvider } from 'react-dnd';
-import { HTML5Backend } from 'react-dnd-html5-backend';
 import ExpandCell from "./components/ExpandCell";
 import Footer from "./components/Footer";
+import DndWrapper from "./components/DndWrapper";
 import { getRowKey, getTableColumns, prefixCls } from "./helper";
 import useExpandable, { getExpandableConfig } from "./hooks/useExpandable";
 import useFixed from "./hooks/useFixed";
@@ -513,8 +512,6 @@ function Table(props, ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classnames(prefixCls('main'), (_classnames8 = {}, _defineProperty(_classnames8, prefixCls('overflow-hidden'), !!y), _defineProperty(_classnames8, prefixCls('ping-left'), isPingLeft), _defineProperty(_classnames8, prefixCls('ping-right'), isPingRight), _classnames8))
-  }, rowDnd ? /*#__PURE__*/React.createElement(DndProvider, {
-    backend: HTML5Backend
-  }, tableContent) : tableContent)));
+  }, rowDnd ? /*#__PURE__*/React.createElement(DndWrapper, null, tableContent) : tableContent)));
 }
 export default /*#__PURE__*/forwardRef(Table);

package/dist/Tabs/style/index.less

@@ -23,6 +23,7 @@
   &.ant-tabs {
     color: var(--alias-colors-text-default);
     font-size: 14px;
+    line-height: @tabs-line-height !important;
 
     .ant-tabs-nav {
       background-color: var(--header-bg-color);