@aloudata/aloudata-design 2.19.0 → 2.19.2

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);