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

package/lib/ProForm/utils/diffOriginal.js

@@ -7,15 +7,17 @@ exports.diffOriginal = void 0;
 var _lodash = require("lodash");
 var _utils = require("../../utils");
 // 过滤对象中undefined字段
-// 防止{a: '1'} {a: '1', b: undefined}被认为不相等
-var filterUndefined = function filterUndefined(data) {
+// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
+var filterObject = function filterObject(data) {
   if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
   var resData = {};
   Object.keys(data).forEach(function (key) {
-    if (data[key] !== undefined) {
+    if (!(0, _utils.isEmpty)(data[key])) {
       resData[key] = data[key];
     }
   });
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
   return resData;
 };
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
@@ -26,18 +28,22 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
     var diffRes = equalWith(originalValue, value);
-    if (diffRes === undefined) return 'same';
-    if (typeof diffRes === 'boolean') {
-      return diffRes ? 'same' : 'changed';
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
+      }
+      return diffRes;
     }
-    return diffRes;
   }
+  var _value = filterObject(value);
+  var _originalValue = filterObject(originalValue);
   // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if ((0, _utils.isEmpty)(originalValue) && !(0, _utils.isEmpty)(value)) {
+  if ((0, _utils.isEmpty)(_originalValue) && !(0, _utils.isEmpty)(_value)) {
     return 'add';
   }
-  if (Array.isArray(originalValue)) {
-    var isSame = originalValue.every(function (valueItem, index) {
+  if (Array.isArray(_originalValue)) {
+    var isSame = _originalValue.every(function (valueItem, index) {
       // 如果两个值有一个不是空值, 则进行深比较
       if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
         return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
@@ -46,8 +52,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     });
     return isSame ? 'same' : 'changed';
   }
-  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return (0, _lodash.isEqual)(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
+  if (!(0, _utils.isEmpty)(_originalValue) || !(0, _utils.isEmpty)(_value)) {
+    return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
   }
   return 'same';
 };

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

@@ -1,10 +1,12 @@
+/**
+ * 调整点：
+ */
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
     rowKey: any;
-    diffToolTip?: boolean;
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;

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

@@ -21,7 +21,10 @@ 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", "originalDiffTip", "toolTipProps", "minWidth", "onDiff"];
+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);
 };
@@ -56,7 +59,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
   var column = _ref2.column,
     originalObj = _ref2.originalObj,
     rowKey = _ref2.rowKey,
-    diffToolTip = _ref2.diffToolTip,
     wrapToolTipProps = _ref2.wrapToolTipProps,
     scroll = _ref2.scroll,
     onUpdateMinWidth = _ref2.onUpdateMinWidth,
@@ -77,7 +79,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    originalDiffTip = column.originalDiffTip,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
@@ -93,7 +94,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     callback: onUpdateMinWidth
   });
   var _toolTipProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toolTipProps), wrapToolTipProps);
-  var _originalDiffTip = (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource) || (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.toolTip);
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -127,10 +127,13 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       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 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);
+      otherProps.isChanged = isChanged;
       // 存在比对
-      if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
+      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,
@@ -139,8 +142,11 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           record: record,
           index: index
         });
+        // viewRender 返回值为 false 时，不显示对比
+        if ((0, _lodash.isBoolean)(diffResult)) {
+          otherProps.isChanged = false;
+        }
         originalValue = diffResult;
-        otherProps.diffChange = diffResult;
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
@@ -150,7 +156,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         value: _value,
         node: _value,
         currentValue: _value,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -177,7 +182,10 @@ 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 ((0, _utils3.isEmpty)(originalValue)) {
@@ -198,13 +206,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       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
@@ -215,7 +222,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     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 ((0, _utils3.isEmpty)(originalValue)) {
@@ -236,13 +246,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       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
@@ -252,7 +261,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     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':
@@ -297,13 +309,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       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
@@ -313,7 +324,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     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;
@@ -338,13 +352,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       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
@@ -353,7 +366,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
   } 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,
@@ -373,13 +389,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       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
@@ -389,7 +404,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     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;
@@ -428,13 +446,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       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: renderNode,
         value: renderValue,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -461,7 +478,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     };
   } 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: {
@@ -475,13 +495,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         size: 8,
         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
@@ -490,7 +509,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     };
   } 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)]
@@ -506,13 +528,12 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       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,14 +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;
-    diffChange?: boolean;
+    isChanged?: boolean;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

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

@@ -10,6 +10,7 @@ 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");
@@ -27,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,
@@ -39,11 +39,12 @@ var RenderColumn = function RenderColumn(props) {
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
   var cellDiffCls = (0, _classnames.default)({
-    'varied-cell': originalDiffTip
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
   });
-  if (!(0, _utils.isEmpty)(originalValue) && !isInNewRowFlag) {
+  // 比对场景走的逻辑
+  if (!isInNewRowFlag && (0, _lodash.isBoolean)(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalDiffTip) {
+    if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
       renderNode = (0, _jsxRuntime.jsx)(Text, {
         style: {
           width: currentValue === '-' ? 32.5 : width,
@@ -54,29 +55,35 @@ var RenderColumn = function RenderColumn(props) {
         },
         children: ellipsis ? currentValue : renderNode
       });
-      if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+      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: 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", !Array.isArray(originalValue) ? originalValue : null]
+              children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
             }), (0, _jsxRuntime.jsx)(_antd.Space, {
               className: "current-value-container",
               children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -92,7 +99,7 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
-    if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
       return renderNode;
     }
     return (0, _jsxRuntime.jsx)("span", {
@@ -145,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.js

@@ -221,7 +221,6 @@ var ProTable = function ProTable(props) {
         originalObj: originalObj,
         rowKey: props.rowKey,
         diffConfig: diffConfig,
-        diffToolTip: toolTip,
         wrapToolTipProps: wrapToolTipProps,
         scroll: _scroll,
         onUpdateMinWidth: function onUpdateMinWidth(w) {

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 | {
@@ -46,7 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         originValue: any;
     }) => boolean;
     viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
-    diffChange?: boolean;
+    isChanged?: boolean | null;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProTable/utils/index.d.ts

@@ -11,9 +11,12 @@ export declare const getDecimalDigits: (num?: number) => number;
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
-export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
+export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => {
+    originalValue: any;
+    isChanged: boolean;
+};
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 判断数据是否为Response<List<any>>结构

package/lib/ProTable/utils/index.js

@@ -22,18 +22,27 @@ var getDecimalDigits = exports.getDecimalDigits = function getDecimalDigits() {
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
 var getOriginalValue = exports.getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
-    return null;
+    return {
+      originalValue: null,
+      isChanged: null
+    };
   }
   var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
   var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
   if (!(0, _lodash.isEqual)(originalValue, value)) {
-    return originalValue;
+    return {
+      originalValue: originalValue,
+      isChanged: true
+    };
   }
-  return null;
+  return {
+    originalValue: null,
+    isChanged: false
+  };
 };
 var getColumnDataIndex = exports.getColumnDataIndex = function getColumnDataIndex(dataIndex) {
   return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');

package/lib/style/theme/antd.less

@@ -280,8 +280,10 @@
     table {
       .@{ant-prefix}-table-tbody {
         .@{ant-prefix}-table-row:nth-child(even) {
-          &:hover td {
-            background-color: @zaui-table-hover-bg;
+          &:hover td,
+          &:hover td.@{ant-prefix}-table-cell-fix-right,
+          &:hover td.@{ant-prefix}-table-cell-fix-left {
+            background-color: @zaui-table-hover-bg !important;
           }
 
           & td,

package/lib/utils/index.d.ts

@@ -1,3 +1,3 @@
 /** 判断一个值是否是空值 */
-export declare const isEmpty: (value: any) => boolean;
+export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/lib/utils/index.js

@@ -9,7 +9,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var EMPTY_VALUE = [undefined, null, ''];
 /** 判断一个值是否是空值 */
-var isEmpty = exports.isEmpty = function isEmpty(value) {
+var isEmpty = exports.isEmpty = function isEmpty(value, emptyValue) {
+  if (emptyValue) {
+    EMPTY_VALUE.push(emptyValue);
+  }
   if (EMPTY_VALUE.includes(value)) {
     return true;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.0-beta.9",
+  "version": "3.9.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",