@zat-design/sisyphus-react 3.6.10-beta.1 → 3.6.10-beta.3

package/es/ProEditTable/utils/index.js

@@ -13,7 +13,7 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import { cloneDeep, isArray, isBoolean, isEqual } from 'lodash';
+import { cloneDeep, cloneDeepWith, isArray, isBoolean, isEqual } from 'lodash';
 import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { tools } from '@zat-design/utils';
@@ -25,16 +25,21 @@ import tipSvg from '../../assets/tip.svg';
 import locale from '../../locale';
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
-  var disabled = config.disabled,
-    name = config.name,
-    form = config.form,
-    virtualKey = config.virtualKey,
-    validateKeys = config.validateKeys,
-    actionWidth = config.actionWidth,
-    actionProps = config.actionProps,
-    page = config.page,
-    rowDisabled = config.rowDisabled,
-    actionDirection = config.actionDirection;
+  var _cloneDeepWith = cloneDeepWith(config, function (value) {
+      if ( /*#__PURE__*/React.isValidElement(value)) {
+        return value;
+      }
+    }),
+    disabled = _cloneDeepWith.disabled,
+    name = _cloneDeepWith.name,
+    form = _cloneDeepWith.form,
+    virtualKey = _cloneDeepWith.virtualKey,
+    validateKeys = _cloneDeepWith.validateKeys,
+    actionWidth = _cloneDeepWith.actionWidth,
+    actionProps = _cloneDeepWith.actionProps,
+    page = _cloneDeepWith.page,
+    rowDisabled = _cloneDeepWith.rowDisabled,
+    actionDirection = _cloneDeepWith.actionDirection;
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.d.ts

@@ -5,7 +5,7 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     disabled?: boolean;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey, onDragStartGuard, onDragMoveGuard, onDragOverGuard, onDragEndGuard, onDragCancelGuard, }: {
+declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey, onDragStartGuard, onDragEndGuard, }: {
     draggable: any;
     value: any;
     onChange: any;
@@ -13,9 +13,6 @@ declare const DndWrapper: ({ draggable, value, onChange, disabled, children, row
     children: any;
     rowKey: any;
     onDragStartGuard: any;
-    onDragMoveGuard: any;
-    onDragOverGuard: any;
     onDragEndGuard: any;
-    onDragCancelGuard: any;
 }) => any;
 export default DndWrapper;

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -72,90 +72,49 @@ var DndWrapper = function DndWrapper(_ref2) {
     children = _ref2.children,
     rowKey = _ref2.rowKey,
     onDragStartGuard = _ref2.onDragStartGuard,
-    onDragMoveGuard = _ref2.onDragMoveGuard,
-    onDragOverGuard = _ref2.onDragOverGuard,
-    onDragEndGuard = _ref2.onDragEndGuard,
-    onDragCancelGuard = _ref2.onDragCancelGuard;
+    onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(event) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+      var active, transformedValue, activeObject;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            active = _ref3.active;
             if (!(onDragStartGuard && isFunction(onDragStartGuard))) {
-              _context.next = 3;
+              _context.next = 6;
               break;
             }
-            _context.next = 3;
+            // 为数据源划分层级及parentId
+            transformedValue = addLevelAndParentId(value, rowKey);
+            activeObject = treeNodeFind(transformedValue, function (t) {
+              return t.rowKey === active.id;
+            });
+            _context.next = 6;
             return onDragStartGuard({
-              event: event
+              activeObject: activeObject,
+              currentDataSource: value
             });
-          case 3:
+          case 6:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function onDragStart(_x) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
-  var onDragMove = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (!(onDragMoveGuard && isFunction(onDragMoveGuard))) {
-              _context2.next = 3;
-              break;
-            }
-            _context2.next = 3;
-            return onDragMoveGuard({
-              event: event
-            });
-          case 3:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function onDragMove(_x2) {
       return _ref4.apply(this, arguments);
     };
   }();
-  var onDragOver = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(event) {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            if (!(onDragOverGuard && isFunction(onDragOverGuard))) {
-              _context3.next = 3;
-              break;
-            }
-            _context3.next = 3;
-            return onDragOverGuard({
-              event: event
-            });
-          case 3:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    return function onDragOver(_x3) {
-      return _ref5.apply(this, arguments);
-    };
-  }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref6) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            active = _ref6.active, over = _ref6.over;
+            active = _ref5.active, over = _ref5.over;
             // 为数据源划分层级及parentId
             transformedValue = addLevelAndParentId(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
             if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
-              _context4.next = 15;
+              _context2.next = 15;
               break;
             }
             activeObject = treeNodeFind(transformedValue, function (t) {
@@ -165,28 +124,25 @@ var DndWrapper = function DndWrapper(_ref2) {
               return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
             });
             if (!(activeObject && overObject)) {
-              _context4.next = 15;
+              _context2.next = 15;
               break;
             }
             activeLevel = activeObject.level, activeParentId = activeObject.parentId;
             overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
             if (!(onDragEndGuard && isFunction(onDragEndGuard))) {
-              _context4.next = 14;
+              _context2.next = 14;
               break;
             }
-            _context4.next = 11;
+            _context2.next = 11;
             return onDragEndGuard({
               activeObject: activeObject,
               overObject: overObject,
-              currentDataSource: value,
-              transformTreeToArray: transformTreeToArray,
-              arrayMove: arrayMove,
-              createTreeFromArray: createTreeFromArray
+              currentDataSource: value
             });
           case 11:
-            nextDataSource = _context4.sent;
+            nextDataSource = _context2.sent;
             onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
-            return _context4.abrupt("return");
+            return _context2.abrupt("return");
           case 14:
             if (activeLevel === overLevel && activeParentId === overParentId) {
               // 将树平铺
@@ -210,35 +166,12 @@ var DndWrapper = function DndWrapper(_ref2) {
             }
           case 15:
           case "end":
-            return _context4.stop();
-        }
-      }, _callee4);
-    }));
-    return function onDragEnd(_x4) {
-      return _ref7.apply(this, arguments);
-    };
-  }();
-  var onDragCancel = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(event) {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            if (!(onDragCancelGuard && isFunction(onDragCancelGuard))) {
-              _context5.next = 3;
-              break;
-            }
-            _context5.next = 3;
-            return onDragCancelGuard({
-              event: event
-            });
-          case 3:
-          case "end":
-            return _context5.stop();
+            return _context2.stop();
         }
-      }, _callee5);
+      }, _callee2);
     }));
-    return function onDragCancel(_x5) {
-      return _ref8.apply(this, arguments);
+    return function onDragEnd(_x2) {
+      return _ref6.apply(this, arguments);
     };
   }();
   // 将树平铺
@@ -248,11 +181,8 @@ var DndWrapper = function DndWrapper(_ref2) {
     });
   });
   return draggable && !disabled ? _jsx(DndContext, {
-    onDragEnd: onDragEnd,
     onDragStart: onDragStart,
-    onDragMove: onDragMove,
-    onDragOver: onDragOver,
-    onDragCancel: onDragCancel,
+    onDragEnd: onDragEnd,
     collisionDetection: closestCorners,
     children: _jsx(SortableContext, {
       items: (flatTree === null || flatTree === void 0 ? void 0 : (_flatTree$ = flatTree[0]) === null || _flatTree$ === void 0 ? void 0 : _flatTree$.rowKey) ? flatTree.map(function (i) {

package/es/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -32,10 +32,7 @@ var DraggableTable = function DraggableTable(_ref) {
     draggable = draggableProps.draggable,
     rowKey = draggableProps.rowKey,
     onDragStartGuard = draggableProps.onDragStartGuard,
-    onDragMoveGuard = draggableProps.onDragMoveGuard,
-    onDragOverGuard = draggableProps.onDragOverGuard,
-    onDragEndGuard = draggableProps.onDragEndGuard,
-    onDragCancelGuard = draggableProps.onDragCancelGuard;
+    onDragEndGuard = draggableProps.onDragEndGuard;
   return _jsx(DndWrapper, {
     value: dataSource !== null && dataSource !== void 0 ? dataSource : [],
     onChange: onChange,
@@ -43,10 +40,7 @@ var DraggableTable = function DraggableTable(_ref) {
     draggable: draggable,
     rowKey: rowKey,
     onDragStartGuard: onDragStartGuard,
-    onDragMoveGuard: onDragMoveGuard,
-    onDragOverGuard: onDragOverGuard,
     onDragEndGuard: onDragEndGuard,
-    onDragCancelGuard: onDragCancelGuard,
     children: _jsx(_Table, _objectSpread(_objectSpread({
       className: "pro-edit-table-drag",
       components: {

package/es/ProTable/index.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource", "onDragStart", "onDragMove", "onDragOver", "onDragEnd", "onDragCancel"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource", "onDragStart", "onDragEnd"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
@@ -54,10 +54,7 @@ function ProTable(props) {
     emptyText = _props$emptyText === void 0 ? locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData : _props$emptyText,
     originalDataSource = props.originalDataSource,
     onDragStartGuard = props.onDragStart,
-    onDragMoveGuard = props.onDragMove,
-    onDragOverGuard = props.onDragOver,
     onDragEndGuard = props.onDragEnd,
-    onDragCancelGuard = props.onDragCancel,
     restProps = _objectWithoutProperties(props, _excluded);
   var quickTableConfig = quickConfig ? _objectSpread({
     columnConfig: true,
@@ -359,10 +356,7 @@ function ProTable(props) {
             draggable: draggable,
             rowKey: rowKey,
             onDragStartGuard: onDragStartGuard,
-            onDragMoveGuard: onDragMoveGuard,
-            onDragOverGuard: onDragOverGuard,
-            onDragEndGuard: onDragEndGuard,
-            onDragCancelGuard: onDragCancelGuard
+            onDragEndGuard: onDragEndGuard
           },
           tableProps: {
             value: _dataSource,

package/es/ProTable/propsType.d.ts

@@ -3,7 +3,6 @@ import { TableProps } from 'antd/es/table/Table';
 import { ColumnType, GetRowKey, RowSelectionType } from 'antd/es/table/interface';
 import { FormInstance } from 'antd';
 import type { TooltipProps } from 'antd';
-import type { DragStartEvent, DragMoveEvent, DragOverEvent, DragCancelEvent } from '@dnd-kit/core';
 interface SummaryColumnProps {
     key: string | string[];
     index: number;
@@ -52,11 +51,12 @@ export interface DragCommonGuardProps<T> {
 }
 export interface DragEndGuardProps {
     activeObject: any;
-    overObject: any;
+    overObject?: any;
+    currentDataSource: any[];
+}
+export interface DragStartGuardProps {
+    activeObject: any;
     currentDataSource: any[];
-    transformTreeToArray: (tree: any[]) => any[];
-    arrayMove: (array: any[], from: number, to: number) => any[];
-    createTreeFromArray: (array: any[], options: CreateTreeFromArrayOptions) => any[];
 }
 export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary' | 'columns'> {
     tableId?: string;
@@ -87,10 +87,7 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
     /**
      * 拖拽额外配置
      */
-    onDragStart?: DragCommonGuardProps<DragStartEvent>;
-    onDragMove?: DragCommonGuardProps<DragMoveEvent>;
-    onDragOver?: DragCommonGuardProps<DragOverEvent>;
-    onDragCancel?: DragCommonGuardProps<DragCancelEvent>;
+    onDragStart?: DragStartGuardProps;
     onDragEnd?: DragEndGuardProps;
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';

package/lib/ProEditTable/utils/index.js

@@ -29,16 +29,21 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
-  var disabled = config.disabled,
-    name = config.name,
-    form = config.form,
-    virtualKey = config.virtualKey,
-    validateKeys = config.validateKeys,
-    actionWidth = config.actionWidth,
-    actionProps = config.actionProps,
-    page = config.page,
-    rowDisabled = config.rowDisabled,
-    actionDirection = config.actionDirection;
+  var _cloneDeepWith = (0, _lodash.cloneDeepWith)(config, function (value) {
+      if ( /*#__PURE__*/_react.default.isValidElement(value)) {
+        return value;
+      }
+    }),
+    disabled = _cloneDeepWith.disabled,
+    name = _cloneDeepWith.name,
+    form = _cloneDeepWith.form,
+    virtualKey = _cloneDeepWith.virtualKey,
+    validateKeys = _cloneDeepWith.validateKeys,
+    actionWidth = _cloneDeepWith.actionWidth,
+    actionProps = _cloneDeepWith.actionProps,
+    page = _cloneDeepWith.page,
+    rowDisabled = _cloneDeepWith.rowDisabled,
+    actionDirection = _cloneDeepWith.actionDirection;
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.d.ts

@@ -5,7 +5,7 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     disabled?: boolean;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey, onDragStartGuard, onDragMoveGuard, onDragOverGuard, onDragEndGuard, onDragCancelGuard, }: {
+declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey, onDragStartGuard, onDragEndGuard, }: {
     draggable: any;
     value: any;
     onChange: any;
@@ -13,9 +13,6 @@ declare const DndWrapper: ({ draggable, value, onChange, disabled, children, row
     children: any;
     rowKey: any;
     onDragStartGuard: any;
-    onDragMoveGuard: any;
-    onDragOverGuard: any;
     onDragEndGuard: any;
-    onDragCancelGuard: any;
 }) => any;
 export default DndWrapper;

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -79,90 +79,49 @@ var DndWrapper = function DndWrapper(_ref2) {
     children = _ref2.children,
     rowKey = _ref2.rowKey,
     onDragStartGuard = _ref2.onDragStartGuard,
-    onDragMoveGuard = _ref2.onDragMoveGuard,
-    onDragOverGuard = _ref2.onDragOverGuard,
-    onDragEndGuard = _ref2.onDragEndGuard,
-    onDragCancelGuard = _ref2.onDragCancelGuard;
+    onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(event) {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref3) {
+      var active, transformedValue, activeObject;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            active = _ref3.active;
             if (!(onDragStartGuard && (0, _lodash.isFunction)(onDragStartGuard))) {
-              _context.next = 3;
+              _context.next = 6;
               break;
             }
-            _context.next = 3;
+            // 为数据源划分层级及parentId
+            transformedValue = (0, _index.addLevelAndParentId)(value, rowKey);
+            activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
+              return t.rowKey === active.id;
+            });
+            _context.next = 6;
             return onDragStartGuard({
-              event: event
+              activeObject: activeObject,
+              currentDataSource: value
             });
-          case 3:
+          case 6:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function onDragStart(_x) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
-  var onDragMove = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(event) {
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (!(onDragMoveGuard && (0, _lodash.isFunction)(onDragMoveGuard))) {
-              _context2.next = 3;
-              break;
-            }
-            _context2.next = 3;
-            return onDragMoveGuard({
-              event: event
-            });
-          case 3:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function onDragMove(_x2) {
       return _ref4.apply(this, arguments);
     };
   }();
-  var onDragOver = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(event) {
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            if (!(onDragOverGuard && (0, _lodash.isFunction)(onDragOverGuard))) {
-              _context3.next = 3;
-              break;
-            }
-            _context3.next = 3;
-            return onDragOverGuard({
-              event: event
-            });
-          case 3:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    return function onDragOver(_x3) {
-      return _ref5.apply(this, arguments);
-    };
-  }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(_ref6) {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
       var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            active = _ref6.active, over = _ref6.over;
+            active = _ref5.active, over = _ref5.over;
             // 为数据源划分层级及parentId
             transformedValue = (0, _index.addLevelAndParentId)(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
             if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
-              _context4.next = 15;
+              _context2.next = 15;
               break;
             }
             activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
@@ -172,28 +131,25 @@ var DndWrapper = function DndWrapper(_ref2) {
               return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
             });
             if (!(activeObject && overObject)) {
-              _context4.next = 15;
+              _context2.next = 15;
               break;
             }
             activeLevel = activeObject.level, activeParentId = activeObject.parentId;
             overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
             if (!(onDragEndGuard && (0, _lodash.isFunction)(onDragEndGuard))) {
-              _context4.next = 14;
+              _context2.next = 14;
               break;
             }
-            _context4.next = 11;
+            _context2.next = 11;
             return onDragEndGuard({
               activeObject: activeObject,
               overObject: overObject,
-              currentDataSource: value,
-              transformTreeToArray: _index.transformTreeToArray,
-              arrayMove: _sortable.arrayMove,
-              createTreeFromArray: _index.createTreeFromArray
+              currentDataSource: value
             });
           case 11:
-            nextDataSource = _context4.sent;
+            nextDataSource = _context2.sent;
             onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
-            return _context4.abrupt("return");
+            return _context2.abrupt("return");
           case 14:
             if (activeLevel === overLevel && activeParentId === overParentId) {
               // 将树平铺
@@ -217,35 +173,12 @@ var DndWrapper = function DndWrapper(_ref2) {
             }
           case 15:
           case "end":
-            return _context4.stop();
-        }
-      }, _callee4);
-    }));
-    return function onDragEnd(_x4) {
-      return _ref7.apply(this, arguments);
-    };
-  }();
-  var onDragCancel = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5(event) {
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            if (!(onDragCancelGuard && (0, _lodash.isFunction)(onDragCancelGuard))) {
-              _context5.next = 3;
-              break;
-            }
-            _context5.next = 3;
-            return onDragCancelGuard({
-              event: event
-            });
-          case 3:
-          case "end":
-            return _context5.stop();
+            return _context2.stop();
         }
-      }, _callee5);
+      }, _callee2);
     }));
-    return function onDragCancel(_x5) {
-      return _ref8.apply(this, arguments);
+    return function onDragEnd(_x2) {
+      return _ref6.apply(this, arguments);
     };
   }();
   // 将树平铺
@@ -255,11 +188,8 @@ var DndWrapper = function DndWrapper(_ref2) {
     });
   });
   return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
-    onDragEnd: onDragEnd,
     onDragStart: onDragStart,
-    onDragMove: onDragMove,
-    onDragOver: onDragOver,
-    onDragCancel: onDragCancel,
+    onDragEnd: onDragEnd,
     collisionDetection: _core.closestCorners,
     children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
       items: (flatTree === null || flatTree === void 0 ? void 0 : (_flatTree$ = flatTree[0]) === null || _flatTree$ === void 0 ? void 0 : _flatTree$.rowKey) ? flatTree.map(function (i) {

package/lib/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -38,10 +38,7 @@ var DraggableTable = function DraggableTable(_ref) {
     draggable = draggableProps.draggable,
     rowKey = draggableProps.rowKey,
     onDragStartGuard = draggableProps.onDragStartGuard,
-    onDragMoveGuard = draggableProps.onDragMoveGuard,
-    onDragOverGuard = draggableProps.onDragOverGuard,
-    onDragEndGuard = draggableProps.onDragEndGuard,
-    onDragCancelGuard = draggableProps.onDragCancelGuard;
+    onDragEndGuard = draggableProps.onDragEndGuard;
   return (0, _jsxRuntime.jsx)(_DndWrapper.default, {
     value: dataSource !== null && dataSource !== void 0 ? dataSource : [],
     onChange: onChange,
@@ -49,10 +46,7 @@ var DraggableTable = function DraggableTable(_ref) {
     draggable: draggable,
     rowKey: rowKey,
     onDragStartGuard: onDragStartGuard,
-    onDragMoveGuard: onDragMoveGuard,
-    onDragOverGuard: onDragOverGuard,
     onDragEndGuard: onDragEndGuard,
-    onDragCancelGuard: onDragCancelGuard,
     children: (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       className: "pro-edit-table-drag",
       components: {

package/lib/ProTable/index.js

@@ -27,7 +27,7 @@ var _reset = _interopRequireDefault(require("../assets/reset.svg"));
 var _customColumn = _interopRequireDefault(require("../assets/customColumn.svg"));
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource", "onDragStart", "onDragMove", "onDragOver", "onDragEnd", "onDragCancel"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource", "onDragStart", "onDragEnd"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
@@ -61,10 +61,7 @@ function ProTable(props) {
     emptyText = _props$emptyText === void 0 ? _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable = _locale.default.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData : _props$emptyText,
     originalDataSource = props.originalDataSource,
     onDragStartGuard = props.onDragStart,
-    onDragMoveGuard = props.onDragMove,
-    onDragOverGuard = props.onDragOver,
     onDragEndGuard = props.onDragEnd,
-    onDragCancelGuard = props.onDragCancel,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var quickTableConfig = quickConfig ? (0, _objectSpread4.default)({
     columnConfig: true,
@@ -366,10 +363,7 @@ function ProTable(props) {
             draggable: draggable,
             rowKey: rowKey,
             onDragStartGuard: onDragStartGuard,
-            onDragMoveGuard: onDragMoveGuard,
-            onDragOverGuard: onDragOverGuard,
-            onDragEndGuard: onDragEndGuard,
-            onDragCancelGuard: onDragCancelGuard
+            onDragEndGuard: onDragEndGuard
           },
           tableProps: {
             value: _dataSource,