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

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,
-        ellipsis: ellipsis !== null && ellipsis !== void 0 ? ellipsis : true,
+        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
-      });
+      }));
     };
   }
 };

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;

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

@@ -8,8 +8,11 @@ import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useSetState } from 'ahooks';
+import { isBoolean } from 'lodash';
+import classNames from 'classnames';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
+import { isEmpty } from '../../../utils';
 import copySvg from '../../../assets/copy.svg';
 var Paragraph = _Typography.Paragraph,
   Text = _Typography.Text;
@@ -23,7 +26,6 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
@@ -34,39 +36,55 @@ var RenderColumn = function RenderColumn(props) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
-  if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
+  var cellDiffCls = classNames({
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
+  });
+  // 比对场景走的逻辑
+  if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalDiffTip) {
-      if (ellipsis) {
-        renderNode = _jsx(Text, {
-          style: {
-            width: currentValue === '-' ? 32.5 : width,
-            minWidth: minWidth
-          },
-          ellipsis: {
-            tooltip: false
-          },
-          children: ellipsis ? currentValue : renderNode
-        });
+    if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
+      renderNode = _jsx(Text, {
+        style: {
+          width: currentValue === '-' ? 32.5 : width,
+          minWidth: minWidth
+        },
+        ellipsis: {
+          tooltip: false
+        },
+        children: ellipsis ? currentValue : renderNode
+      });
+      if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
+        return renderNode;
+      }
+      if (Array.isArray(originalValue)) {
+        console.error('Error: When enabled, dataIndex corresponds to an array, which needs to be converted using viewRender');
       }
+      var originalValueCalc = function originalValueCalc() {
+        if (Array.isArray(originalValue)) {
+          return null;
+        }
+        return !isEmpty(originalValue) ? originalValue : '-';
+      };
       return _jsx(_Tooltip, _objectSpread(_objectSpread({
-        className: "varied-cell",
+        className: cellDiffCls,
         style: {
           width: width,
           minWidth: minWidth
         },
-        overlayClassName: "original-value-tootip",
+        overlayClassName: "original-value-tooltip",
+        placement: "topLeft",
+        autoAdjustOverflow: false,
         title: _jsx(_Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: originalDiffTip ? _jsxs(_Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? _jsxs(_Fragment, {
             children: [_jsxs(_Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
+              children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
             }), _jsx(_Space, {
               className: "current-value-container",
-              children: ellipsis ? _jsxs("span", {
+              children: ellipsis ? _jsxs(_Space, {
                 children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
               }) : null
             })]
@@ -79,8 +97,11 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
+    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
+      return renderNode;
+    }
     return _jsx("span", {
-      className: "varied-cell",
+      className: cellDiffCls,
       style: {
         width: width,
         minWidth: minWidth
@@ -129,15 +150,12 @@ var RenderColumn = function RenderColumn(props) {
       range.setStart(box, 0);
       range.setEnd(box, box.childNodes.length);
       var rangeWidth = range.getBoundingClientRect().width;
-      var rangeHeight = range.getBoundingClientRect().height;
-      var contentWidth = rangeWidth - Math.floor(rangeWidth);
       var _getPadding = getPadding(box),
         pLeft = _getPadding.pLeft,
         pRight = _getPadding.pRight,
         pTop = _getPadding.pTop,
         pBottom = _getPadding.pBottom;
       var horizontalPadding = pLeft + pRight;
-      var verticalPadding = pTop + pBottom;
       if (rangeWidth + horizontalPadding > box.clientWidth) {
         return true;
       }

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

@@ -3,10 +3,9 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["onDrag", "width", "minwidth"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useState, useContext } from 'react';
+import { useState } from 'react';
 import { Resizable } from 'react-resizable';
 import classnames from 'classnames';
-import { TableContext } from '../../index';
 import { getParentElement } from '../FormatColumn';
 var ResizableTitle = function ResizableTitle(props) {
   var _restProps$className;
@@ -15,9 +14,6 @@ var ResizableTitle = function ResizableTitle(props) {
     _props$minwidth = props.minwidth,
     minwidth = _props$minwidth === void 0 ? 50 : _props$minwidth,
     restProps = _objectWithoutProperties(props, _excluded);
-  var _useContext = useContext(TableContext),
-    tableConfig = _useContext.tableConfig,
-    Storage = _useContext.Storage;
   // 添加偏移量
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),

package/es/ProTable/index.d.ts

@@ -1,19 +1,20 @@
 /// <reference types="react" />
 import { ProTableProps } from './propsType';
+import useAntdTable from './hooks/useAntdTable';
 export declare const TableContext: import("react").Context<{}>;
 export declare const defaultPage: {
     pageNum: number;
     pageSize: number;
 };
-declare function ProTable(props: ProTableProps): import("react/jsx-runtime").JSX.Element;
-declare namespace ProTable {
-    var defaultProps: {
+declare const ProTable: {
+    (props: ProTableProps): import("react/jsx-runtime").JSX.Element;
+    defaultProps: {
         quickConfig: boolean;
         stripe: boolean;
         draggable: boolean;
         disabled: boolean;
         isView: boolean;
     };
-    var useAntdTable: typeof import("./hooks/useAntdTable").default;
-}
+    useAntdTable: typeof useAntdTable;
+};
 export default ProTable;

package/es/ProTable/index.js

@@ -29,7 +29,7 @@ export var defaultPage = {
   pageNum: 1,
   pageSize: 10
 };
-function ProTable(props) {
+var ProTable = function ProTable(props) {
   var _locale$ProTable, _props$scroll, _curTableConfig$pathK;
   var _ref = useProConfig('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
@@ -114,7 +114,6 @@ function ProTable(props) {
     });
   });
   var originalObj = _originalDataSource ? keyBy(_originalDataSource, 'rowKey') : undefined;
-  var dataSourceObj = _dataSource ? keyBy(_dataSource, 'rowKey') : {};
   var propsColumnObj = useMemo(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
@@ -213,9 +212,8 @@ function ProTable(props) {
       formatColumn({
         column: item,
         originalObj: originalObj,
-        dataSourceObj: dataSourceObj,
-        rowKey: 'rowKey',
-        diffToolTip: toolTip,
+        rowKey: props.rowKey,
+        diffConfig: diffConfig,
         wrapToolTipProps: wrapToolTipProps,
         scroll: _scroll,
         onUpdateMinWidth: function onUpdateMinWidth(w) {
@@ -447,7 +445,7 @@ function ProTable(props) {
       })]
     })
   });
-}
+};
 ProTable.defaultProps = {
   quickConfig: false,
   stripe: true,

package/es/ProTable/propsType.d.ts

@@ -31,7 +31,6 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: string | number;
     }[];
     copyable?: boolean;
-    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {
@@ -45,6 +44,8 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: any;
         originValue: any;
     }) => boolean;
+    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    isChanged?: boolean | null;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;