@pisell/materials 3.3.32 → 3.3.34

package/es/components/buttonGroupEdit/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import { ButtonGroupListItemProps } from './../buttonGroupPreview';
+interface ButtonGroupEditProps {
+    buttonList: ButtonGroupListItemProps[];
+    buttonGroupList: ButtonGroupListItemProps[][];
+}
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ButtonGroupEditProps & React.RefAttributes<any>>>;
+export default _default;

package/es/components/dataSourceComponents/dataSourceMenu/Basic.js

@@ -34,8 +34,12 @@ var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
         return null;
       }
       var _children = getShowChildren(item.children || []);
-      if (_children !== null && _children !== void 0 && _children.length) {
-        return /*#__PURE__*/React.createElement(BaseMenu.SubMenu, {
+      if (_children !== null && _children !== void 0 && _children.length || item.isGroup) {
+        var CptMenu = BaseMenu.SubMenu;
+        if (item.type === 'group') {
+          CptMenu = BaseMenu.ItemGroup;
+        }
+        return /*#__PURE__*/React.createElement(CptMenu, {
           key: item.key,
           title: translation(item.label),
           icon: item.icon,

package/es/components/dataSourceComponents/dataSourceTable/hooks/useDataSourceKey.d.ts

@@ -1,5 +1,5 @@
 declare const useDataSourceKey: () => {
-    dataSourceKey: string | undefined;
-    dataSourceKeyRef: import("react").MutableRefObject<string | undefined>;
+    dataSourceKey: string | import("../../provider/dataSource/DataSourceContext").DataSourceType | undefined;
+    dataSourceKeyRef: import("react").MutableRefObject<string | import("../../provider/dataSource/DataSourceContext").DataSourceType | undefined>;
 };
 export default useDataSourceKey;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
+    title: string | number | boolean | React.ReactFragment | JSX.Element | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
+    subTitle: string | number | boolean | React.ReactFragment | JSX.Element | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: JSX.Element | null;
     onRow: (record: any) => any;
@@ -52,7 +52,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "link" | "button";
+        type: "button" | "link";
         items: OperationItem[];
     } | undefined;
     operationContent?: {
@@ -70,7 +70,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "large" | "middle" | "small";
         openTitle: string;
         key: string;
     } | undefined;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.d.ts

@@ -0,0 +1,32 @@
+import { DataSourceTableProps } from '../type';
+declare type Params = {
+    pagination?: {
+        page: number;
+        size: number;
+    };
+    order_by?: string;
+    tabs?: {
+        name: string;
+        filterBy: Record<string, any>;
+        sortBy: string;
+    };
+};
+declare const useTableQuery: (props: DataSourceTableProps) => {
+    queryPageConfig: {
+        page: number;
+        pageSize: number;
+        filter: Record<string, any>;
+        sort: string;
+    };
+    setQueryPageConfig: import("react").Dispatch<import("react").SetStateAction<{
+        page: number;
+        pageSize: number;
+        filter: Record<string, any>;
+        sort: string;
+    }>>;
+    handleValuesChange: (params: Params, allParams: Params) => void;
+    refreshData: () => void;
+    handleFilterChange: (changedFields: any, allFields: any) => void;
+    refreshCurrentPage: () => void;
+};
+export default useTableQuery;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.js

@@ -21,7 +21,7 @@ var useTableQuery = function useTableQuery(props) {
   // 分页配置
   var _useState = useState({
       page: 1,
-      pageSize: 20,
+      pageSize: 10,
       filter: (tabs === null || tabs === void 0 || (_tabs$items = tabs.items) === null || _tabs$items === void 0 || (_tabs$items = _tabs$items[0]) === null || _tabs$items === void 0 ? void 0 : _tabs$items.filterBy) || filterBy || {},
       sort: (tabs === null || tabs === void 0 || (_tabs$items2 = tabs.items) === null || _tabs$items2 === void 0 || (_tabs$items2 = _tabs$items2[0]) === null || _tabs$items2 === void 0 ? void 0 : _tabs$items2.sortBy) || sortBy
     }),

package/es/components/dataSourceComponents/fields/DatePicker/ReadPretty.d.ts

@@ -0,0 +1,5 @@
+import type { FC } from 'react';
+import { DatePickerProps } from './type';
+import './ReadPretty.less';
+declare const DatePickerReadPretty: FC<DatePickerProps>;
+export default DatePickerReadPretty;

package/es/components/dataSourceComponents/fields/DatePicker/ReadPretty.js

@@ -3,23 +3,15 @@ import classNames from 'classnames';
 import dayjs from 'dayjs';
 import usePisellConfig from "../../../pisell-config-provider/hooks/usePisellConfig";
 import "./ReadPretty.less";
-var DEFAULT_FORMAT = 'DD/MM/YYYY HH:mm';
+var DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 var DATE_FORMATS = {
   'zh-CN': {
-    withTime: 'YYYY-MM-DD HH:mm',
+    withTime: 'YYYY-MM-DD HH:mm:ss',
     withoutTime: 'YYYY-MM-DD'
   },
   'en-US': {
-    withTime: 'MM/DD/YYYY HH:mm',
-    withoutTime: 'MM/DD/YYYY'
-  },
-  'en-AU': {
-    withTime: 'DD/MM/YYYY HH:mm',
-    withoutTime: 'DD/MM/YYYY'
-  },
-  en: {
-    withTime: 'DD/MM/YYYY HH:mm',
-    withoutTime: 'DD/MM/YYYY'
+    withTime: 'HH:mm:ss YYYY-MM-DD',
+    withoutTime: 'YYYY-MM-DD'
   }
 };
 var DatePickerReadPretty = function DatePickerReadPretty(_ref) {

package/es/components/dataSourceComponents/fields/utils.js

@@ -67,11 +67,6 @@ var formFieldFilterFuncMap = {
       $eq: value
     };
   },
-  'Input.TextArea': function InputTextArea(value) {
-    return {
-      $includes: value
-    };
-  },
   'Input.JSON': function InputJSON(value) {
     return {
       $includes: value

package/es/components/div/index.js

@@ -1,17 +1,54 @@
-var _excluded = ["children", "style", "others"];
-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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["baseClassName", "className", "render", "children", "style", "others"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React from "react";
+import React, { useMemo } from "react";
 var Div = function Div(props) {
-  var children = props.children,
+  var _props$baseClassName = props.baseClassName,
+    baseClassName = _props$baseClassName === void 0 ? "div" : _props$baseClassName,
+    _props$className = props.className,
+    className = _props$className === void 0 ? "" : _props$className,
+    render = props.render,
+    children = props.children,
     _props$style = props.style,
     style = _props$style === void 0 ? {} : _props$style,
     _props$others = props.others,
     others = _props$others === void 0 ? {} : _props$others,
     otherProps = _objectWithoutProperties(props, _excluded);
-  return /*#__PURE__*/React.createElement("div", _extends({
-    style: style
-  }, others, otherProps), children);
+
+  // 合并类名
+  var combinedClassName = useMemo(function () {
+    var parts = [baseClassName, className].filter(Boolean);
+    return parts.length > 0 ? parts.join(' ') : undefined;
+  }, [baseClassName, className]);
+
+  // 决定渲染内容：优先使用 render 函数
+  var content = useMemo(function () {
+    if (render) {
+      try {
+        return render();
+      } catch (error) {
+        console.error('Div render function error:', error);
+        return children;
+      }
+    }
+    return children;
+  }, [render, children]);
+
+  // 合并所有要传递给 div 的 props
+  var divProps = useMemo(function () {
+    return _objectSpread(_objectSpread(_objectSpread({}, combinedClassName && {
+      className: combinedClassName
+    }), {}, {
+      style: style
+    }, others), otherProps);
+  }, [combinedClassName, style, others, otherProps]);
+  return /*#__PURE__*/React.createElement("div", divProps, content);
 };
-export default Div;
+Div.displayName = 'Div';
+export default /*#__PURE__*/React.memo(Div);

package/es/components/pisellDraggable/components/TreeItem/SortableTreeItem.js

@@ -10,7 +10,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import React from 'react';
+import React, { memo } from 'react';
 import { iOS } from "../../utilities";
 import { TreeItem } from "./TreeItem";
 var animateLayoutChanges = function animateLayoutChanges(_ref) {
@@ -18,7 +18,7 @@ var animateLayoutChanges = function animateLayoutChanges(_ref) {
     wasDragging = _ref.wasDragging;
   return isSorting || wasDragging ? false : true;
 };
-export function SortableTreeItem(_ref2) {
+var SortableTreeItem = function SortableTreeItem(_ref2) {
   var id = _ref2.id,
     depth = _ref2.depth,
     props = _objectWithoutProperties(_ref2, _excluded);
@@ -48,4 +48,5 @@ export function SortableTreeItem(_ref2) {
     disableInteraction: isSorting,
     handleProps: _objectSpread(_objectSpread({}, attributes), listeners)
   }, props));
-}
+};
+export default /*#__PURE__*/memo(SortableTreeItem);

package/es/components/pisellDraggable/components/TreeItem/index.js

@@ -1,2 +1,2 @@
 export { TreeItem } from "./TreeItem";
-export { SortableTreeItem } from "./SortableTreeItem";
+export { default as SortableTreeItem } from "./SortableTreeItem";

package/es/components/pisellDraggable/index.js

@@ -26,6 +26,7 @@ import { DndContext, DragOverlay, MeasuringStrategy, PointerSensor, closestCente
 import { SortableContext, arrayMove, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
+import { useMemoizedFn } from 'ahooks';
 import { CSS } from '@dnd-kit/utilities';
 import { SortableTreeItem } from "./components";
 import { buildTree, flattenTree, getChildCount, getProjection, removeChildrenOf, removeItem, setProperty } from "./utilities";
@@ -119,12 +120,13 @@ export function SortableTree(_ref3) {
     indentationWidth = _ref3$indentationWidt === void 0 ? 50 : _ref3$indentationWidt,
     _ref3$removable = _ref3.removable,
     removable = _ref3$removable === void 0 ? true : _ref3$removable,
-    renderItem = _ref3.renderItem,
+    _renderItem = _ref3.renderItem,
     onChange = _ref3.onChange,
     onRemoveBefore = _ref3.onRemoveBefore,
     __designMode = _ref3.__designMode,
     _ref3$maxLevel = _ref3.maxLevel,
-    maxLevel = _ref3$maxLevel === void 0 ? 3 : _ref3$maxLevel;
+    maxLevel = _ref3$maxLevel === void 0 ? 3 : _ref3$maxLevel,
+    canDrop = _ref3.canDrop;
   // 状态管理
   /** 当前树形数据 */
   var _useState = useState([]),
@@ -171,6 +173,7 @@ export function SortableTree(_ref3) {
     return removeChildrenOf(flattenTreeData, activeId != null ? [activeId].concat(_toConsumableArray(collapsedItems)) : collapsedItems);
   }, [activeId, flattenTreeData]);
   console.log('flattenedItems', flattenedItems);
+
   /**
    * 计算拖拽投影
    * 根据当前拖拽状态计算目标位置和深度
@@ -192,10 +195,12 @@ export function SortableTree(_ref3) {
       return id;
     });
   }, [flattenedItems]);
-  var activeItem = activeId ? flattenedItems.find(function (_ref6) {
-    var id = _ref6.id;
-    return id === activeId;
-  }) : null;
+  var activeItem = useMemo(function () {
+    return activeId ? flattenedItems.find(function (_ref6) {
+      var id = _ref6.id;
+      return id === activeId;
+    }) : null;
+  }, [activeId, flattenedItems]);
   useEffect(function () {
     sensorContext.current = {
       items: flattenedItems,
@@ -238,74 +243,67 @@ export function SortableTree(_ref3) {
       return childNewDepth >= maxLevel || checkSubtreeDepth(items, child.id, childNewDepth);
     });
   }
-  return /*#__PURE__*/React.createElement(DndContext, {
-    sensors: sensors,
-    collisionDetection: closestCenter,
-    measuring: measuring,
-    onDragStart: handleDragStart,
-    onDragMove: handleDragMove,
-    onDragOver: handleDragOver,
-    onDragEnd: handleDragEnd,
-    onDragCancel: handleDragCancel
-  }, /*#__PURE__*/React.createElement(SortableContext, {
-    items: sortedIds,
-    strategy: verticalListSortingStrategy
-  }, flattenedItems.map(function (item) {
-    var id = item.id,
-      children = item.children,
-      collapsed = item.collapsed,
-      depth = item.depth;
-    return /*#__PURE__*/React.createElement(SortableTreeItem, {
-      key: id,
-      id: id,
-      item: item,
-      depth: id === activeId && projected ? projected.depth : depth,
-      indentationWidth: indentationWidth,
-      indicator: indicator,
-      collapsed: Boolean(collapsed && (children === null || children === void 0 ? void 0 : children.length)),
-      onCollapse: collapsible && children !== null && children !== void 0 && children.length ? function () {
-        return handleCollapse(id);
-      } : undefined,
-      onRemove: removable ? function () {
-        return handleRemove(item);
-      } : undefined,
-      renderItem: renderItem,
-      __designMode: __designMode
-    });
-  }), /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(DragOverlay, {
-    dropAnimation: dropAnimationConfig,
-    modifiers: indicator ? [adjustTranslate] : undefined
-  }, activeId && activeItem ? /*#__PURE__*/React.createElement(SortableTreeItem, {
-    id: activeId,
-    depth: activeItem.depth,
-    clone: true,
-    childCount: getChildCount(items, activeId) + 1,
-    item: activeItem,
-    indentationWidth: indentationWidth,
-    renderItem: renderItem
-  }) : null), document.body)));
 
   /**
-   * 处理拖拽开始事件
-   * 设置当前拖拽项和初始状态
+   * 处理节点删除
+   * 从树形结构中移除指定节点
    */
-  function handleDragStart(_ref7) {
-    var activeId = _ref7.active.id;
+  var handleRemove = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!onRemoveBefore) {
+              _context.next = 6;
+              break;
+            }
+            _context.next = 3;
+            return onRemoveBefore === null || onRemoveBefore === void 0 ? void 0 : onRemoveBefore(item);
+          case 3:
+            res = _context.sent;
+            if (res) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            setItems(function (items) {
+              return removeItem(items, item.id);
+            });
+            onChange === null || onChange === void 0 || onChange(items);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref7.apply(this, arguments);
+    };
+  }());
+
+  /**
+  * 处理拖拽开始事件
+  * 设置当前拖拽项和初始状态
+  */
+  var handleDragStart = useMemoizedFn(function (_ref8) {
+    var activeId = _ref8.active.id;
     setActiveId(activeId);
     setOverId(activeId);
     document.body.style.setProperty('cursor', 'grabbing');
-  }
+  });
 
   /**
    * 处理拖拽移动事件
    * 更新水平偏移量
    */
-  function handleDragMove(_ref8) {
-    var delta = _ref8.delta;
+  var handleDragMove = useMemoizedFn(function (_ref9) {
+    var delta = _ref9.delta;
     setOffsetLeft(delta.x);
-  }
-  function handleDragOver(_ref9) {
-    var over = _ref9.over;
+  });
+  var handleDragOver = useMemoizedFn(function (_ref10) {
+    var over = _ref10.over;
     if (!projected || !over) {
       var _over$id;
       setOverId((_over$id = over === null || over === void 0 ? void 0 : over.id) !== null && _over$id !== void 0 ? _over$id : null);
@@ -331,7 +329,12 @@ export function SortableTree(_ref3) {
       return;
     }
     setOverId(over.id);
-  }
+  });
+  var parentNode = useMemo(function () {
+    return projected !== null && projected !== void 0 && projected.parentId ? flattenedItems.find(function (item) {
+      return item.id === projected.parentId;
+    }) : null;
+  }, [flattenedItems, projected === null || projected === void 0 ? void 0 : projected.parentId]);
 
   /**
    * 处理拖拽结束事件
@@ -339,22 +342,38 @@ export function SortableTree(_ref3) {
    * 2. 更新节点位置和层级
    * 3. 重建树形结构
    */
-  function handleDragEnd(_ref10) {
-    var active = _ref10.active,
-      over = _ref10.over;
+  var handleDragEnd = useMemoizedFn(function (_ref11) {
+    var active = _ref11.active,
+      over = _ref11.over;
     resetState();
     if (projected && over) {
       var depth = projected.depth,
-        parentId = projected.parentId;
+        _parentId = projected.parentId;
 
       // 检查目标父节点是否禁止拖入
-      var targetParent = parentId ? flattenedItems.find(function (item) {
-        return item.id === parentId;
+      var targetParent = _parentId ? flattenedItems.find(function (item) {
+        return item.id === _parentId;
       }) : null;
       if (targetParent !== null && targetParent !== void 0 && targetParent.disabledDrop) {
         return;
       }
 
+      // 获取拖拽元素和目标元素
+      var _dragItem = flattenedItems.find(function (item) {
+        return item.id === active.id;
+      });
+      var _dropTarget = flattenedItems.find(function (item) {
+        return item.id === over.id;
+      });
+
+      // 调用自定义拖拽判断函数
+      if (canDrop && _dragItem && _dropTarget) {
+        var canDropResult = canDrop(_dragItem, _dropTarget, _parentId, targetParent);
+        if (!canDropResult) {
+          return;
+        }
+      }
+
       // 检查是否超过最大层级限制
       if (depth >= maxLevel) {
         return;
@@ -366,84 +385,103 @@ export function SortableTree(_ref3) {
         return;
       }
       var clonedItems = JSON.parse(JSON.stringify(flattenTree(items)));
-      var overIndex = clonedItems.findIndex(function (_ref11) {
-        var id = _ref11.id;
+      var overIndex = clonedItems.findIndex(function (_ref12) {
+        var id = _ref12.id;
         return id === over.id;
       });
-      var activeIndex = clonedItems.findIndex(function (_ref12) {
-        var id = _ref12.id;
+      var activeIndex = clonedItems.findIndex(function (_ref13) {
+        var id = _ref13.id;
         return id === active.id;
       });
       var activeTreeItem = clonedItems[activeIndex];
       clonedItems[activeIndex] = _objectSpread(_objectSpread({}, activeTreeItem), {}, {
         depth: depth,
-        parentId: parentId
+        parentId: _parentId
       });
       var sortedItems = arrayMove(clonedItems, activeIndex, overIndex);
       var newItems = buildTree(sortedItems);
       setItems(newItems);
       onChange === null || onChange === void 0 || onChange(newItems);
     }
-  }
-  function handleDragCancel() {
-    resetState();
-  }
-  function resetState() {
-    setOverId(null);
-    setActiveId(null);
-    setOffsetLeft(0);
-    document.body.style.setProperty('cursor', '');
-  }
+  });
 
-  /**
-   * 处理节点删除
-   * 从树形结构中移除指定节点
-   */
-  function handleRemove(_x) {
-    return _handleRemove.apply(this, arguments);
-  }
   /**
    * 处理节点折叠/展开
    * 切换指定节点的折叠状态
    */
-  function _handleRemove() {
-    _handleRemove = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item) {
-      var res;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!onRemoveBefore) {
-              _context.next = 6;
-              break;
-            }
-            _context.next = 3;
-            return onRemoveBefore === null || onRemoveBefore === void 0 ? void 0 : onRemoveBefore(item);
-          case 3:
-            res = _context.sent;
-            if (res) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return");
-          case 6:
-            setItems(function (items) {
-              return removeItem(items, item.id);
-            });
-            onChange === null || onChange === void 0 || onChange(items);
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return _handleRemove.apply(this, arguments);
-  }
-  function handleCollapse(id) {
+  var handleCollapse = useMemoizedFn(function (id) {
     setItems(function (items) {
-      return setProperty(items, id, 'collapsed', function (value) {
+      var newVal = setProperty(items, id, 'collapsed', function (value) {
         return !value;
       });
+      onChange === null || onChange === void 0 || onChange(items);
+      return newVal;
+    });
+  });
+  var isError = useMemo(function () {
+    return !(canDrop !== null && canDrop !== void 0 && canDrop(activeItem || {}, {}, projected === null || projected === void 0 ? void 0 : projected.parentId, parentNode));
+  }, [projected, activeItem, canDrop, parentNode]);
+  var renderTreeItems = useMemo(function () {
+    return flattenedItems.map(function (item) {
+      var id = item.id,
+        children = item.children,
+        collapsed = item.collapsed,
+        depth = item.depth;
+      return /*#__PURE__*/React.createElement(SortableTreeItem, {
+        key: id,
+        id: id,
+        item: item,
+        depth: id === activeId && projected ? projected.depth : depth,
+        indentationWidth: indentationWidth,
+        indicator: indicator,
+        collapsed: Boolean(collapsed && (children === null || children === void 0 ? void 0 : children.length)),
+        onCollapse: collapsible && children !== null && children !== void 0 && children.length ? function () {
+          return handleCollapse(id);
+        } : undefined,
+        onRemove: removable ? function () {
+          return handleRemove(item);
+        } : undefined,
+        renderItem: _renderItem,
+        __designMode: __designMode
+      });
     });
+  }, [flattenedItems, activeId, projected === null || projected === void 0 ? void 0 : projected.depth, indentationWidth, indicator, collapsible, handleCollapse, handleRemove, _renderItem, __designMode]);
+  return /*#__PURE__*/React.createElement(DndContext, {
+    sensors: sensors,
+    collisionDetection: closestCenter,
+    measuring: measuring,
+    onDragStart: handleDragStart,
+    onDragMove: handleDragMove,
+    onDragOver: handleDragOver,
+    onDragEnd: handleDragEnd,
+    onDragCancel: handleDragCancel
+  }, /*#__PURE__*/React.createElement(SortableContext, {
+    items: sortedIds,
+    strategy: verticalListSortingStrategy
+  }, renderTreeItems, /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(DragOverlay, {
+    dropAnimation: dropAnimationConfig,
+    modifiers: indicator ? [adjustTranslate] : undefined
+  }, activeId && activeItem ? /*#__PURE__*/React.createElement(SortableTreeItem, {
+    id: activeId,
+    depth: activeItem.depth,
+    clone: true,
+    childCount: getChildCount(items, activeId) + 1,
+    item: activeItem,
+    indentationWidth: indentationWidth,
+    renderItem: function renderItem(props, ref) {
+      return _renderItem === null || _renderItem === void 0 ? void 0 : _renderItem(_objectSpread(_objectSpread({}, props), {}, {
+        isError: isError
+      }), ref);
+    }
+  }) : null), document.body)));
+  function handleDragCancel() {
+    resetState();
+  }
+  function resetState() {
+    setOverId(null);
+    setActiveId(null);
+    setOffsetLeft(0);
+    document.body.style.setProperty('cursor', '');
   }
 }
 
@@ -451,8 +489,8 @@ export function SortableTree(_ref3) {
  * 调整拖拽项的位置
  * 对拖拽时的位置进行微调，提升视觉效果
  */
-var adjustTranslate = function adjustTranslate(_ref13) {
-  var transform = _ref13.transform;
+var adjustTranslate = function adjustTranslate(_ref14) {
+  var transform = _ref14.transform;
   return _objectSpread(_objectSpread({}, transform), {}, {
     y: transform.y - 25
   });