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

package/lib/ProForm/components/render/Render.js

@@ -11,7 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -24,10 +23,10 @@ var _index = require("../../utils/index");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
-var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
+var _Changed = _interopRequireDefault(require("./Changed"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
@@ -99,18 +98,6 @@ var Render = function Render(props) {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
-  // 判断当前字段是否变更
-  var _useChanged = (0, _useChanged3.useChanged)({
-      name: formItemProps.name,
-      names: otherProps.names,
-      namesStr: namesStr,
-      originalValues: originalValues,
-      form: form,
-      equalWith: equalWith
-    }),
-    _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
-    changed = _useChanged2[0],
-    originalValue = _useChanged2[1];
   var internalRule = (0, _useRules.default)({
     names: otherProps.names,
     label: otherFormItemProps.label,
@@ -182,7 +169,7 @@ var Render = function Render(props) {
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
@@ -440,6 +427,20 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
+    if (originalValues) {
+      child = (0, _jsxRuntime.jsx)(_Changed.default, {
+        name: formItemProps.name,
+        names: otherProps.names,
+        namesStr: namesStr,
+        originalValues: originalValues,
+        form: form,
+        equalWith: equalWith,
+        originalDiffTip: originalDiffTip,
+        type: type,
+        onChange: handleChange,
+        children: child
+      });
+    }
     var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
@@ -466,26 +467,7 @@ var Render = function Render(props) {
         })
       });
     }
-    // 不渲染tooltip
-    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
-      return formItem;
-    }
-    var title = (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.cloneElement(child, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
-        isView: true,
-        value: originalValue,
-        checked: type === 'Switch' ? originalValue : undefined
-      }))]
-    });
-    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-      title: title,
-      open: changed ? undefined : false,
-      // open={true}
-      getPopupContainer: function getPopupContainer(target) {
-        return target.parentElement;
-      },
-      children: formItem
-    });
+    return formItem;
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {

package/lib/ProForm/style/index.less

@@ -116,58 +116,6 @@
       }
     }
 
-    // 比较原始值场景下  不同时的样式
-    &.pro-form-item-changed {
-      span.@{ant-prefix}-input-affix-wrapper,
-      .@{ant-prefix}-select .@{ant-prefix}-select-selector,
-      .@{ant-prefix}-picker,
-      .@{ant-prefix}-input-number {
-        background: @zaui-contract-bg !important;
-
-        input {
-          background: transparent;
-        }
-        .@{ant-prefix}-select-selection-placeholder {
-          z-index: 9;
-        }
-      }
-
-      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
-      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
-        background: @zaui-contract-bg;
-        border-radius: 4px;
-      }
-
-      // 地址组件
-      .@{ant-prefix}-form-item-control-input-content {
-        // 查看模式
-        & > span {
-          border-radius: 4px;
-          padding: 5px 8px;
-          background: @zaui-contract-bg;
-        }
-
-        & > .pro-address {
-          .@{ant-prefix}-select-selector,
-          .@{ant-prefix}-input-affix-wrapper,
-          .@{ant-prefix}-input-disabled {
-            background: @zaui-contract-bg;
-          }
-        }
-        & > .@{ant-prefix}-input-group {
-          .forever-checkbox {
-            background: @zaui-contract-bg;
-          }
-        }
-      }
-
-      .pro-form-view-container {
-        padding: 4px 8px;
-        background: @zaui-contract-bg;
-        border-radius: 4px;
-      }
-    }
-
     .@{ant-prefix}-row {
       width: 100%;
     }
@@ -373,4 +321,56 @@
       }
     }
   }
+
+  // 比较原始值场景下  不同时的样式
+  .pro-form-item-changed {
+    span.@{ant-prefix}-input-affix-wrapper,
+    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-picker,
+    .@{ant-prefix}-input-number {
+      background: @zaui-contract-bg !important;
+
+      input {
+        background: transparent !important;
+      }
+      .@{ant-prefix}-select-selection-placeholder {
+        z-index: 9;
+      }
+    }
+
+    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
+      background: @zaui-contract-bg;
+      border-radius: 4px;
+    }
+
+    // 地址组件
+    .@{ant-prefix}-form-item-control-input-content {
+      // 查看模式
+      & > span {
+        border-radius: 4px;
+        padding: 5px 8px;
+        background: @zaui-contract-bg;
+      }
+
+      & > .pro-address {
+        .@{ant-prefix}-select-selector,
+        .@{ant-prefix}-input-affix-wrapper,
+        .@{ant-prefix}-input-disabled {
+          background: @zaui-contract-bg;
+        }
+      }
+      & > .@{ant-prefix}-input-group {
+        .forever-checkbox {
+          background: @zaui-contract-bg;
+        }
+      }
+    }
+
+    .pro-form-view-container {
+      padding: 4px 8px;
+      background: @zaui-contract-bg;
+      border-radius: 4px;
+    }
+  }
 }

package/lib/ProForm/utils/diffOriginal.d.ts

@@ -3,7 +3,6 @@ interface Params {
     originalValue: any;
     value: any;
     form: FormInstance;
-    name?: string | any[];
     equalWith?: (originalValue: any, currentValue: any) => boolean;
 }
 export declare const diffOriginal: (params: Params) => boolean;

package/lib/ProForm/utils/diffOriginal.js

@@ -1,38 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.diffOriginal = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
-var extractValues = function extractValues(form, pathString) {
-  var _pathString;
-  var result = [];
-  var PrefixesName = (0, _lodash.isString)(pathString) ? [] : pathString.slice(0, -1);
-  if ((0, _lodash.isString)(pathString)) {
-    pathString.split('-').forEach(function (item) {
-      result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
-    });
-    return result;
-  }
-  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
-    result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
-  });
-  return result;
-};
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
-  var _name$join;
   var originalValue = params.originalValue,
-    _value = params.value,
-    equalWith = params.equalWith,
-    form = params.form,
-    name = params.name;
-  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
-  var value = !isNames ? _value : extractValues(form, name);
+    value = params.value,
+    equalWith = params.equalWith;
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
     return !equalWith(originalValue, value);
@@ -47,8 +24,7 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    var res = !(0, _lodash.isEqual)(value, originalValue);
-    return res;
+    return !(0, _lodash.isEqual)(value, originalValue);
   }
   return false;
 };

package/lib/ProForm/utils/useChanged.js

@@ -24,8 +24,7 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith,
-    name: namesStr || name
+    equalWith: equalWith
   });
   return [changed, originalValue];
 };

package/lib/ProForm/utils/useListChanged.js

@@ -91,8 +91,8 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith,
-    name: (0, _lodash.isString)(namesStr) ? namesStr : originalName || name
+    equalWith: equalWith
+    // name: isString(namesStr) ? namesStr : originalName || name,
   });
   return [changed, originalValue];
 };

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

@@ -5,12 +5,14 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     disabled?: boolean;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey }: {
+declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey, onDragStartGuard, onDragEndGuard, }: {
     draggable: any;
     value: any;
     onChange: any;
     disabled: any;
     children: any;
     rowKey: any;
+    onDragStartGuard: any;
+    onDragEndGuard: any;
 }) => any;
 export default DndWrapper;

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Row = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -12,6 +14,7 @@ var _react = _interopRequireDefault(require("react"));
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
+var _lodash = require("lodash");
 var _index = require("./utils/index");
 var _ProIcon = _interopRequireDefault(require("../../../../../../../ProIcon"));
 var _excluded = ["disabled", "children"];
@@ -74,55 +77,119 @@ var DndWrapper = function DndWrapper(_ref2) {
     onChange = _ref2.onChange,
     disabled = _ref2.disabled,
     children = _ref2.children,
-    rowKey = _ref2.rowKey;
-  var onDragEnd = function onDragEnd(_ref3) {
-    var active = _ref3.active,
-      over = _ref3.over;
-    // 为数据源划分层级及parentId
-    var transformedValue = (0, _index.addLevelAndParentId)(value, rowKey);
-    // 同一level层级的且parentId相同的，可以互相之间拖拽替换
-    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      var activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
-        return t.rowKey === active.id;
-      });
-      var overObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
-        return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-      });
-      if (activeObject && overObject) {
-        var activeLevel = activeObject.level,
-          activeParentId = activeObject.parentId;
-        var overLevel = overObject.level,
-          overParentId = overObject.parentId;
-        if (activeLevel === overLevel && activeParentId === overParentId) {
-          // 将树平铺
-          var _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
-            return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-              children: undefined
+    rowKey = _ref2.rowKey,
+    onDragStartGuard = _ref2.onDragStartGuard,
+    onDragEndGuard = _ref2.onDragEndGuard;
+  var onDragStart = /*#__PURE__*/function () {
+    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 = 6;
+              break;
+            }
+            // 为数据源划分层级及parentId
+            _transformedValue = (0, _index.addLevelAndParentId)(value, rowKey);
+            activeObject = (0, _index.treeNodeFind)(_transformedValue, function (t) {
+              return t.rowKey === active.id;
             });
-          });
-          var activeIndex = _flatTree.findIndex(function (i) {
-            return i.rowKey === active.id;
-          });
-          var overIndex = _flatTree.findIndex(function (i) {
-            return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-          });
-          var nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
-          onChange((0, _index.createTreeFromArray)(nextValue, {
-            itemKey: 'rowKey',
-            parentKey: 'parentId',
-            childrenKey: 'children'
-          }));
+            _context.next = 6;
+            return onDragStartGuard({
+              activeObject: activeObject,
+              currentDataSource: value
+            });
+          case 6:
+          case "end":
+            return _context.stop();
         }
-      }
-    }
-  };
+      }, _callee);
+    }));
+    return function onDragStart(_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var onDragEnd = /*#__PURE__*/function () {
+    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 _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            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))) {
+              _context2.next = 15;
+              break;
+            }
+            activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
+              return t.rowKey === active.id;
+            });
+            overObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
+              return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            if (!(activeObject && overObject)) {
+              _context2.next = 15;
+              break;
+            }
+            activeLevel = activeObject.level, activeParentId = activeObject.parentId;
+            overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            if (!(onDragEndGuard && (0, _lodash.isFunction)(onDragEndGuard))) {
+              _context2.next = 14;
+              break;
+            }
+            _context2.next = 11;
+            return onDragEndGuard({
+              activeObject: activeObject,
+              overObject: overObject,
+              currentDataSource: value
+            });
+          case 11:
+            nextDataSource = _context2.sent;
+            onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
+            return _context2.abrupt("return");
+          case 14:
+            if (activeLevel === overLevel && activeParentId === overParentId) {
+              // 将树平铺
+              _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
+                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+                  children: undefined
+                });
+              });
+              activeIndex = _flatTree.findIndex(function (i) {
+                return i.rowKey === active.id;
+              });
+              overIndex = _flatTree.findIndex(function (i) {
+                return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+              });
+              nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
+              onChange((0, _index.createTreeFromArray)(nextValue, {
+                itemKey: 'rowKey',
+                parentKey: 'parentId',
+                childrenKey: 'children'
+              }));
+            }
+          case 15:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onDragEnd(_x2) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var transformedValue = (0, _index.addLevelAndParentId)(value, rowKey);
   // 将树平铺
-  var flatTree = (0, _index.transformTreeToArray)(value).map(function (item) {
+  var flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
       children: undefined
     });
   });
   return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
+    onDragStart: onDragStart,
     onDragEnd: onDragEnd,
     collisionDetection: _core.closestCorners,
     children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {

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

@@ -15,6 +15,14 @@ var _DndWrapper = _interopRequireWildcard(require("./components/DndWrapper"));
 var _index = require("../../../index");
 require("../../../../style/index.less");
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-08-09 13:48:59
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-08-20 19:31:24
+ * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 var DraggableTable = function DraggableTable(_ref) {
   var dataSource = _ref.dataSource,
     tableProps = _ref.tableProps,
@@ -28,13 +36,17 @@ var DraggableTable = function DraggableTable(_ref) {
     disabled = tableProps.disabled;
   var onChange = draggableProps.onChange,
     draggable = draggableProps.draggable,
-    rowKey = draggableProps.rowKey;
+    rowKey = draggableProps.rowKey,
+    onDragStartGuard = draggableProps.onDragStartGuard,
+    onDragEndGuard = draggableProps.onDragEndGuard;
   return (0, _jsxRuntime.jsx)(_DndWrapper.default, {
     value: dataSource !== null && dataSource !== void 0 ? dataSource : [],
     onChange: onChange,
     disabled: disabled,
     draggable: draggable,
     rowKey: rowKey,
+    onDragStartGuard: onDragStartGuard,
+    onDragEndGuard: onDragEndGuard,
     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"],
+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 配置保存时间为一天
 // 全局上下文
@@ -60,6 +60,8 @@ function ProTable(props) {
     _props$emptyText = props.emptyText,
     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,
+    onDragEndGuard = props.onDragEnd,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var quickTableConfig = quickConfig ? (0, _objectSpread4.default)({
     columnConfig: true,
@@ -359,7 +361,9 @@ function ProTable(props) {
           draggableProps: {
             onChange: onDataSourceChange,
             draggable: draggable,
-            rowKey: rowKey
+            rowKey: rowKey,
+            onDragStartGuard: onDragStartGuard,
+            onDragEndGuard: onDragEndGuard
           },
           tableProps: {
             value: _dataSource,

package/lib/ProTable/propsType.d.ts

@@ -41,6 +41,23 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
 }
+export interface CreateTreeFromArrayOptions {
+    itemKey?: string;
+    parentKey?: string;
+    childrenKey?: string;
+}
+export interface DragCommonGuardProps<T> {
+    event: T;
+}
+export interface DragEndGuardProps {
+    activeObject: any;
+    overObject?: any;
+    currentDataSource: any[];
+}
+export interface DragStartGuardProps {
+    activeObject: any;
+    currentDataSource: any[];
+}
 export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary' | 'columns'> {
     tableId?: string;
     rowKey?: string | GetRowKey<any>;
@@ -67,6 +84,11 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
     stripe?: boolean;
     columns: ProTableColumn[];
     originalDataSource?: any[];
+    /**
+     * 拖拽额外配置
+     */
+    onDragStart?: DragStartGuardProps;
+    onDragEnd?: DragEndGuardProps;
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {