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

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getParentElement = exports.formatColumn = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
@@ -17,8 +18,13 @@ var _utils = require("@zat-design/utils");
 var _TooltipTitle = _interopRequireDefault(require("../TooltipTitle"));
 var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
 var _utils2 = require("../../utils");
+var _utils3 = require("../../../utils");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
 var _ProForm = _interopRequireDefault(require("../../../ProForm"));
+var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
+/**
+ * 调整点：
+ */
 var isReactElement = function isReactElement(element) {
   return /*#__PURE__*/(0, _react.isValidElement)(element);
 };
@@ -52,13 +58,12 @@ var calcMinWidth = function calcMinWidth(_ref) {
 var formatColumn = exports.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,
@@ -74,12 +79,11 @@ var formatColumn = exports.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 = (0, _objectWithoutProperties2.default)(column, _excluded);
   // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
   var isMaxContentOverFlow = (0, _lodash.isObject)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
   calcMinWidth({
@@ -90,7 +94,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     callback: onUpdateMinWidth
   });
   var _toolTipProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toolTipProps), wrapToolTipProps);
-  var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -122,39 +125,41 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     var originalRender = column.render; // 保存原始的 render 方法
     // 自定义render 手动重载下
     column.render = function (value, record, index) {
-      var _originalObj$record$r;
       var isFn = (0, _lodash.isFunction)(originalRender);
       var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
-      var originalValue = (0, _utils2.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 = (0, _utils2.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 ((0, _lodash.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 ((0, _lodash.isBoolean)(diffResult)) {
+          otherProps.isChanged = false;
         }
+        originalValue = diffResult;
       }
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
-        originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
+        originalValue: (0, _utils3.isEmpty)(originalValue) ? null : originalValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,
         node: _value,
         currentValue: _value,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
-      });
+      }));
     };
     return;
   }
@@ -177,10 +182,13 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var multiple = valueType === 'percentage' ? 100 : 1000;
       var realValue = _utils.tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = (0, _utils2.getDecimalDigits)(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = (0, _utils2.getDecimalDigits)(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
-      if (!originalValue && originalValue !== 0) {
+      if ((0, _utils3.isEmpty)(originalValue)) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -196,29 +204,31 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.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 ((0, _utils3.isEmpty)(originalValue)) {
         originalRenderValue = '-';
       }
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -234,25 +244,27 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
@@ -295,25 +307,27 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
         var _column$codeValues$fi;
@@ -336,30 +350,32 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.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 = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
-      if (!originalValue && originalValue !== 0) {
+      if ((0, _utils3.isEmpty)(originalValue)) {
         originalRenderValue = '-';
       }
       if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -371,25 +387,27 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.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;
@@ -426,26 +444,25 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         tooltip: false
       });
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
-        children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
           valueType: valueType,
           copyable: copyable,
           ellipsis: ellipsis,
@@ -456,12 +473,15 @@ var formatColumn = exports.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 = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       if (!value && value !== 0 && value === originalValue) {
         (0, _jsxRuntime.jsx)("div", {
           style: {
@@ -473,24 +493,26 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
-        children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
@@ -504,19 +526,18 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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/lib/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/lib/ProTable/components/RenderColumn/index.js

@@ -10,8 +10,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _ahooks = require("ahooks");
+var _lodash = require("lodash");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
+var _utils = require("../../../utils");
 var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
 var Paragraph = _antd.Typography.Paragraph,
   Text = _antd.Typography.Text;
@@ -25,7 +28,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,
@@ -36,39 +38,55 @@ var RenderColumn = function RenderColumn(props) {
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
-  if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
+  var cellDiffCls = (0, _classnames.default)({
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
+  });
+  // 比对场景走的逻辑
+  if (!isInNewRowFlag && (0, _lodash.isBoolean)(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalDiffTip) {
-      if (ellipsis) {
-        renderNode = (0, _jsxRuntime.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 = (0, _jsxRuntime.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 !(0, _utils.isEmpty)(originalValue) ? originalValue : '-';
+      };
       return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        className: "varied-cell",
+        className: cellDiffCls,
         style: {
           width: width,
           minWidth: minWidth
         },
-        overlayClassName: "original-value-tootip",
+        overlayClassName: "original-value-tooltip",
+        placement: "topLeft",
+        autoAdjustOverflow: false,
         title: (0, _jsxRuntime.jsx)(_antd.Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
+              children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
             }), (0, _jsxRuntime.jsx)(_antd.Space, {
               className: "current-value-container",
-              children: ellipsis ? (0, _jsxRuntime.jsxs)("span", {
+              children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {
                 children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
               }) : null
             })]
@@ -81,8 +99,11 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
+    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
+      return renderNode;
+    }
     return (0, _jsxRuntime.jsx)("span", {
-      className: "varied-cell",
+      className: cellDiffCls,
       style: {
         width: width,
         minWidth: minWidth
@@ -131,15 +152,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/lib/ProTable/components/TableResizable/index.js

@@ -12,7 +12,6 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _reactResizable = require("react-resizable");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _index = require("../../index");
 var _FormatColumn = require("../FormatColumn");
 var _excluded = ["onDrag", "width", "minwidth"];
 var ResizableTitle = function ResizableTitle(props) {
@@ -22,9 +21,6 @@ var ResizableTitle = function ResizableTitle(props) {
     _props$minwidth = props.minwidth,
     minwidth = _props$minwidth === void 0 ? 50 : _props$minwidth,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _useContext = (0, _react.useContext)(_index.TableContext),
-    tableConfig = _useContext.tableConfig,
-    Storage = _useContext.Storage;
   // 添加偏移量
   var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),

package/lib/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/lib/ProTable/index.js

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

package/lib/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;