@zat-design/sisyphus-react 3.9.0-beta.2 → 3.9.0-beta.21

package/es/ProStep/index.js

@@ -82,7 +82,7 @@ var ProStep = function ProStep(_ref) {
       return null;
     }
     var subEvent = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var value, _form$validateFields, _error$errorFields;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -128,7 +128,7 @@ var ProStep = function ProStep(_ref) {
     registerMap.current[id] = record;
   };
   var notify = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
       var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -167,7 +167,7 @@ var ProStep = function ProStep(_ref) {
     };
   }();
   var triggerTo = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {

package/es/ProTable/components/FormatColumn/index.d.ts

@@ -1,15 +1,17 @@
+/**
+ * 调整点：
+ */
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
-    dataSourceObj: any;
     rowKey: any;
-    diffToolTip?: boolean;
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;
     isInNewRow?: any;
+    diffConfig: any;
 }) => void;
 /**
  * 查找最近的父级className

package/es/ProTable/components/FormatColumn/index.js

@@ -1,16 +1,22 @@
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * 调整点：
+ */
 import { isValidElement } from 'react';
 import moment from 'moment';
 import classnames from 'classnames';
 import ReactDOM from 'react-dom';
-import { isEqual, isFunction, isString, isObject } from 'lodash';
+import { isEqual, isFunction, isString, isObject, isBoolean } from 'lodash';
 import { tools } from '@zat-design/utils';
 import TooltipTitle from '../TooltipTitle';
 import RenderColumn from '../RenderColumn';
 import { getDecimalDigits, getOriginalValue } from '../../utils';
+import { isEmpty } from '../../../utils';
 import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
 import ProForm from '../../../ProForm';
 var isReactElement = function isReactElement(element) {
@@ -46,13 +52,12 @@ var calcMinWidth = function calcMinWidth(_ref) {
 export var formatColumn = function formatColumn(_ref2) {
   var column = _ref2.column,
     originalObj = _ref2.originalObj,
-    dataSourceObj = _ref2.dataSourceObj,
     rowKey = _ref2.rowKey,
-    diffToolTip = _ref2.diffToolTip,
     wrapToolTipProps = _ref2.wrapToolTipProps,
     scroll = _ref2.scroll,
     onUpdateMinWidth = _ref2.onUpdateMinWidth,
-    isInNewRow = _ref2.isInNewRow;
+    isInNewRow = _ref2.isInNewRow,
+    diffConfig = _ref2.diffConfig;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -68,12 +73,11 @@ export var formatColumn = function formatColumn(_ref2) {
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    _column$originalDiffT = column.originalDiffTip,
-    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
-    onDiff = column.onDiff;
+    onDiff = column.onDiff,
+    otherProps = _objectWithoutProperties(column, _excluded);
   // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
   var isMaxContentOverFlow = isObject(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
   calcMinWidth({
@@ -84,7 +88,6 @@ export var formatColumn = function formatColumn(_ref2) {
     callback: onUpdateMinWidth
   });
   var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
-  var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -116,39 +119,41 @@ export var formatColumn = function formatColumn(_ref2) {
     var originalRender = column.render; // 保存原始的 render 方法
     // 自定义render 手动重载下
     column.render = function (value, record, index) {
-      var _originalObj$record$r;
       var isFn = isFunction(originalRender);
       var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
-      var originalValue = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
-      var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : null;
+      var originalResult = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
       var isInNewRowFlag = isInNewRow(record);
-      var extraDiffFlag = false;
-      // 把比对结果告诉我
-      if (onDiff) {
-        var isDiff = onDiff({
-          value: record,
-          originValue: originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]
+      otherProps.isChanged = isChanged;
+      // 存在比对
+      if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
+        var _originalObj$record$r;
+        var diffResult = otherProps.viewRender({
+          originalValue: originalValue,
+          originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
+          value: value,
+          record: record,
+          index: index
         });
-        if (!isDiff) {
-          originalValue = null;
-        } else {
-          originalValue = true;
-          extraDiffFlag = true;
+        // viewRender 返回值为 false 时，不显示对比
+        if (isBoolean(diffResult)) {
+          otherProps.isChanged = false;
         }
+        originalValue = diffResult;
       }
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
+        originalValue: isEmpty(originalValue) ? null : originalValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,
         node: _value,
         currentValue: _value,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
     return;
   }
@@ -171,10 +176,13 @@ export var formatColumn = function formatColumn(_ref2) {
       var multiple = valueType === 'percentage' ? 100 : 1000;
       var realValue = tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
-      if (!originalValue && originalValue !== 0) {
+      if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -190,29 +198,31 @@ export var formatColumn = function formatColumn(_ref2) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        originalValue: originalValue === null ? null : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
     // 千分位, 千分位带CNY前缀
   } else if (['thousandth', 'thousandthCNY'].includes(valueType)) {
     column.render = function (value, record, index) {
       var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
       var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-      if (!originalValue && originalValue !== 0) {
+      if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
       var node = _jsxs(_Space, {
@@ -228,25 +238,27 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        originalValue: originalValue === null ? null : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     column.render = function (value, record, index) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = (_moment2 = moment(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
@@ -289,25 +301,27 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        originalValue: originalValue === null ? null : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
     column.render = function (value, record, index) {
       var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
         var _column$codeValues$fi;
@@ -330,30 +344,32 @@ export var formatColumn = function formatColumn(_ref2) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        originalValue: originalValue === null ? null : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
-      if (!originalValue && originalValue !== 0) {
+      if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -365,25 +381,27 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        originalValue: originalValue === null ? null : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (valueType === 'address') {
     column.render = function (value, record, index) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRealValue = transform ? transform(originalValue, record) : originalValue;
       var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
         return !!item;
@@ -420,26 +438,25 @@ export var formatColumn = function formatColumn(_ref2) {
         tooltip: false
       });
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        originalValue: originalValue === null ? null : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: renderNode,
         value: renderValue,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   } else if (copyable) {
     column.render = function (value, record, index) {
       var isInNewRowFlag = isInNewRow(record);
       return _jsxs(_Space, {
         size: 8,
-        children: [prefixNode(value, record, index), _jsx(RenderColumn, {
+        children: [prefixNode(value, record, index), _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
           valueType: valueType,
           copyable: copyable,
           ellipsis: ellipsis,
@@ -450,12 +467,15 @@ export var formatColumn = function formatColumn(_ref2) {
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
           isInNewRowFlag: isInNewRowFlag
-        }), suffixNode(value, record, index)]
+        })), suffixNode(value, record, index)]
       });
     };
   } else if (ellipsis) {
     column.render = function (value, record, index) {
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       if (!value && value !== 0 && value === originalValue) {
         _jsx("div", {
           style: {
@@ -467,24 +487,26 @@ export var formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       return _jsxs(_Space, {
         size: 8,
-        children: [prefixNode(value, record, index), _jsx(RenderColumn, {
+        children: [prefixNode(value, record, index), _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
           valueType: valueType,
-          originalValue: originalValue === undefined ? undefined : originalValue || '-',
+          originalValue: originalValue === null ? null : originalValue || '-',
           ellipsis: ellipsis,
           width: width,
           node: value,
           value: value,
           currentValue: value || '-',
-          originalDiffTip: _originalDiffTip,
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
           isInNewRowFlag: isInNewRowFlag
-        }), suffixNode(value, record, index)]
+        })), suffixNode(value, record, index)]
       });
     };
   } else {
     column.render = function (value, record, index) {
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var node = _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
@@ -498,19 +520,18 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return _jsx(RenderColumn, {
+      return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalValue || '-',
+        originalValue: originalValue === null ? null : originalValue || '-',
         ellipsis: ellipsis,
         width: width,
         node: node,
         value: value,
         currentValue: value || '-',
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
   }
 };
@@ -527,14 +548,14 @@ export var getParentElement = function getParentElement(element, name) {
   if (!element || !name) {
     return result;
   }
-  var _searchDom = function searchDom(element, name) {
+  var searchDom = function searchDom(element, name) {
     var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
     if (element.parentElement[type] === name) {
       result = element.parentElement;
       return false;
     }
-    _searchDom(element.parentElement, name, type = 'className');
+    searchDom(element.parentElement, name, type = 'className');
   };
-  _searchDom(element, name, type = 'className');
+  searchDom(element, name, type = 'className');
   return result;
 };

package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts

@@ -7,5 +7,5 @@ declare const _default: import("react").MemoExoticComponent<({ dataSource, table
     draggableProps: any;
     summaryProps: any;
     emptyTextProps: any;
-}) => import("react/jsx-runtime").JSX.Element>;
+}) => JSX.Element>;
 export default _default;

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

@@ -74,7 +74,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragStartGuard = _ref2.onDragStartGuard,
     onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+    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) {
@@ -105,7 +105,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     };
   }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    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) {

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

@@ -9,7 +9,7 @@ export var getRowKey = function getRowKey(rowKey, record) {
   }
   return key;
 };
-var _addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
+export var addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
   var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var currentParentId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   return tree.map(function (node) {
@@ -18,12 +18,11 @@ var _addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
     newNode.parentId = currentParentId;
     newNode.rowKey = getRowKey(rowKey, node);
     if (node.children) {
-      newNode.children = _addLevelAndParentId(node.children, rowKey, currentLevel + 1, newNode.rowKey);
+      newNode.children = addLevelAndParentId(node.children, rowKey, currentLevel + 1, newNode.rowKey);
     }
     return newNode;
   });
 };
-export { _addLevelAndParentId as addLevelAndParentId };
 export function getFinalChildrenKey(tree, meta, options) {
   if (typeof options.getChildrenKey === 'function') {
     var dynamicChildrenKey = options.getChildrenKey(tree, meta);
@@ -34,7 +33,7 @@ export function getFinalChildrenKey(tree, meta, options) {
   return options.childrenKey;
 }
 // 前置深度优先遍历
-var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
+var treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
   var callbackResult = callback(treeItem, options);
   if (callbackResult) {
     return treeItem;
@@ -46,7 +45,7 @@ var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
   }
   for (var i = 0, count = children.length; i < count; i++) {
     var childItem = children[i];
-    var findOne = _treeNodePreImpl(childItem, callback, _objectSpread(_objectSpread({}, options), {}, {
+    var findOne = treeNodePreImpl(childItem, callback, _objectSpread(_objectSpread({}, options), {}, {
       parents: [].concat(_toConsumableArray(options.parents), [treeItem]),
       depth: options.depth + 1
     }));
@@ -57,7 +56,7 @@ var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
   return undefined;
 };
 var treeNodeStrategies = {
-  pre: _treeNodePreImpl
+  pre: treeNodePreImpl
 };
 export function treeNodeFind(tree, callback, options) {
   var _options$childrenKey, _options$strategy;
@@ -122,7 +121,7 @@ export function createTreeFromArray(array, options) {
   return result;
 }
 // 前置遍历
-var _treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options) {
+var treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options) {
   callback(treeItem, options);
   var finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
   var children = treeItem === null || treeItem === void 0 ? void 0 : treeItem[finalChildrenKey];
@@ -132,12 +131,12 @@ var _treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, option
       depth: options.depth + 1
     });
     children.forEach(function (childItem) {
-      _treeForEachPreImpl(childItem, callback, nextLevelOptions);
+      treeForEachPreImpl(childItem, callback, nextLevelOptions);
     });
   }
 };
 var treeForEachStrategies = {
-  pre: _treeForEachPreImpl
+  pre: treeForEachPreImpl
 };
 export function treeForEach(tree, callback, options) {
   var _options$childrenKey2, _options$strategy2;

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

@@ -7,5 +7,5 @@ declare const _default: import("react").MemoExoticComponent<({ dataSource, table
     draggableProps: any;
     summaryProps: any;
     emptyTextProps: any;
-}) => import("react/jsx-runtime").JSX.Element>;
+}) => JSX.Element>;
 export default _default;

package/es/ProTable/components/RenderColumn/index.d.ts

@@ -6,13 +6,13 @@ interface Props {
     value?: any;
     currentValue?: any;
     copyable?: boolean;
-    originalDiffTip?: boolean;
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     minWidth?: number;
     isInNewRowFlag?: boolean;
+    isChanged?: boolean;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;