@zat-design/sisyphus-react 3.6.9-beta.7 → 3.6.10-beta.2

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

@@ -1,5 +1,7 @@
 import "antd/es/col/style";
 import _Col from "antd/es/col";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -11,6 +13,7 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -25,10 +28,10 @@ import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from '../../uti
 import { useProConfig } from '../../../ProConfigProvider';
 import transformNames from '../../utils/transformNames';
 import valueTypeMap from '../../utils/valueType';
+import { useChanged } from '../../utils/useChanged';
 import tipSvg from '../../../assets/tip.svg';
 import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
-import Changed from './Changed';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
@@ -98,6 +101,18 @@ var Render = function Render(props) {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
+  // 判断当前字段是否变更
+  var _useChanged = useChanged({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = _slicedToArray(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var internalRule = useRules({
     names: otherProps.names,
     label: otherFormItemProps.label,
@@ -169,7 +184,7 @@ var Render = function Render(props) {
   var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = classNames(_defineProperty(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed), '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 _jsx(_Form.Item, {
@@ -427,20 +442,6 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    if (originalValues) {
-      child = _jsx(Changed, {
-        name: formItemProps.name,
-        names: otherProps.names,
-        namesStr: namesStr,
-        originalValues: originalValues,
-        form: form,
-        equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
-        type: type,
-        onChange: handleChange,
-        children: child
-      });
-    }
     var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
@@ -467,7 +468,26 @@ var Render = function Render(props) {
         })
       });
     }
-    return formItem;
+    // 不渲染tooltip
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
+      return formItem;
+    }
+    var title = _jsxs(_Space, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.cloneElement(child, _objectSpread(_objectSpread({}, child), {}, {
+        isView: true,
+        value: originalValue,
+        checked: type === 'Switch' ? originalValue : undefined
+      }))]
+    });
+    return _jsx(_Tooltip, {
+      title: title,
+      open: changed ? undefined : false,
+      // open={true}
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
+      children: formItem
+    });
   };
   var FormItem = _jsxs(_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/es/ProForm/style/index.less

@@ -116,6 +116,58 @@
       }
     }
 
+    // 比较原始值场景下  不同时的样式
+    &.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%;
     }
@@ -321,56 +373,4 @@
       }
     }
   }
-
-  // 比较原始值场景下  不同时的样式
-  .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/es/ProForm/utils/diffOriginal.d.ts

@@ -3,6 +3,7 @@ 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/es/ProForm/utils/diffOriginal.js

@@ -1,9 +1,31 @@
-import { isEqual, isFunction } from 'lodash';
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { isEqual, isFunction, isString } from '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 = isString(pathString) ? [] : pathString.slice(0, -1);
+  if (isString(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat(_toConsumableArray(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(_toConsumableArray(PrefixesName), [item])));
+  });
+  return result;
+};
 export var diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
-    value = params.value,
-    equalWith = params.equalWith;
+    _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);
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
     return !equalWith(originalValue, value);
@@ -18,7 +40,8 @@ export var diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
+    var res = !isEqual(value, originalValue);
+    return res;
   }
   return false;
 };

package/es/ProForm/utils/useChanged.js

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

package/es/ProForm/utils/useListChanged.js

@@ -1,6 +1,6 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import { get } from 'lodash';
+import { get, isString } from 'lodash';
 import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
@@ -86,8 +86,8 @@ export var useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
-    // name: isString(namesStr) ? namesStr : originalName || name,
+    equalWith: equalWith,
+    name: isString(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

package/es/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/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -1,3 +1,5 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["disabled", "children"];
@@ -6,6 +8,7 @@ import React from 'react';
 import { DndContext, closestCorners } from '@dnd-kit/core';
 import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
+import { isFunction } from 'lodash';
 import { addLevelAndParentId, treeNodeFind, transformTreeToArray, createTreeFromArray } from './utils/index';
 import ProIcon from '../../../../../../../ProIcon';
 export var Row = function Row(props) {
@@ -67,48 +70,110 @@ 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 = addLevelAndParentId(value, rowKey);
-    // 同一level层级的且parentId相同的，可以互相之间拖拽替换
-    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      var activeObject = treeNodeFind(transformedValue, function (t) {
-        return t.rowKey === active.id;
-      });
-      var overObject = 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 = transformTreeToArray(transformedValue).map(function (item) {
-            return _objectSpread(_objectSpread({}, item), {}, {
-              children: undefined
+    rowKey = _ref2.rowKey,
+    onDragStartGuard = _ref2.onDragStartGuard,
+    onDragEndGuard = _ref2.onDragEndGuard;
+  var onDragStart = /*#__PURE__*/function () {
+    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 = 6;
+              break;
+            }
+            // 为数据源划分层级及parentId
+            transformedValue = addLevelAndParentId(value, rowKey);
+            activeObject = 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 = arrayMove(_flatTree, activeIndex, overIndex);
-          onChange(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 = _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 _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            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))) {
+              _context2.next = 15;
+              break;
+            }
+            activeObject = treeNodeFind(transformedValue, function (t) {
+              return t.rowKey === active.id;
+            });
+            overObject = 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 && 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 = transformTreeToArray(transformedValue).map(function (item) {
+                return _objectSpread(_objectSpread({}, 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 = arrayMove(_flatTree, activeIndex, overIndex);
+              onChange(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 flatTree = transformTreeToArray(value).map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
@@ -116,6 +181,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     });
   });
   return draggable && !disabled ? _jsx(DndContext, {
+    onDragStart: onDragStart,
     onDragEnd: onDragEnd,
     collisionDetection: closestCorners,
     children: _jsx(SortableContext, {

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

@@ -4,6 +4,15 @@ import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
+/*
+ * @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
+ */
+
 import { memo } from 'react';
 import DndWrapper, { Row } from './components/DndWrapper';
 import { RenderEmptyText, RenderSummary } from '../../../index';
@@ -21,13 +30,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 _jsx(DndWrapper, {
     value: dataSource !== null && dataSource !== void 0 ? dataSource : [],
     onChange: onChange,
     disabled: disabled,
     draggable: draggable,
     rowKey: rowKey,
+    onDragStartGuard: onDragStartGuard,
+    onDragEndGuard: onDragEndGuard,
     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"],
+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';
@@ -53,6 +53,8 @@ function ProTable(props) {
     _props$emptyText = props.emptyText,
     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,
+    onDragEndGuard = props.onDragEnd,
     restProps = _objectWithoutProperties(props, _excluded);
   var quickTableConfig = quickConfig ? _objectSpread({
     columnConfig: true,
@@ -352,7 +354,9 @@ function ProTable(props) {
           draggableProps: {
             onChange: onDataSourceChange,
             draggable: draggable,
-            rowKey: rowKey
+            rowKey: rowKey,
+            onDragStartGuard: onDragStartGuard,
+            onDragEndGuard: onDragEndGuard
           },
           tableProps: {
             value: _dataSource,

package/es/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> {

package/es/ProThemeTools/component/{ProTools → PrdTools}/index.d.ts

@@ -1,3 +1,3 @@
 import type { DevToolsPropsType } from '../../propsType';
-declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
-export default ProTools;
+declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
+export default PrdTools;

package/es/ProThemeTools/component/{ProTools → PrdTools}/index.js

@@ -21,7 +21,7 @@ var connect = function connect(Component) {
   return ComponentWrapper;
 };
 var NewDrawer = connect(_Drawer);
-var ProTools = function ProTools(_ref) {
+var PrdTools = function PrdTools(_ref) {
   var onReset = _ref.onReset,
     onClose = _ref.onClose,
     setState = _ref.setState,
@@ -266,4 +266,4 @@ var ProTools = function ProTools(_ref) {
     })]
   });
 };
-export default ProTools;
+export default PrdTools;

package/es/ProThemeTools/component/index.d.ts

@@ -1 +1,2 @@
-export { default as ProTools } from './ProTools';
+/// <reference types="typings" />
+export { default as PrdTools } from './PrdTools';

package/es/ProThemeTools/component/index.js

@@ -1 +1,2 @@
-export { default as ProTools } from './ProTools';
+/// <reference path="../../../typings.d.ts" />;
+export { default as PrdTools } from './PrdTools';

package/es/ProThemeTools/index.js

@@ -17,7 +17,7 @@ import { isEqual } from 'lodash';
 import classnames from 'classnames';
 import { getKebabCase, setThemes, setTableBorder, getMapKebabCase, getMapHumpCase } from './utils/index';
 import settingSvg from '../assets/setting.svg';
-import { ProTools } from './component';
+import { PrdTools } from './component';
 import locale from '../locale';
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
@@ -183,7 +183,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
         className: "setting-icon",
         src: settingSvg
       })
-    }), _jsx(ProTools, {
+    }), _jsx(PrdTools, {
       prefixCls: prefixCls,
       onReset: onReset,
       onClose: toggle,

package/es/ProThemeTools/style/index.less

@@ -1,7 +1,7 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
-@import '../component/ProTools/style/index.less';
+@import '../component/PrdTools/style/index.less';
 
 .pro-theme-tools {
   display: flex;