@zat-design/sisyphus-react 3.8.3-beta.14 → 3.8.3-beta.16

package/dist/index.esm.css

@@ -5644,7 +5644,7 @@ input[type='button'] {
           user-select: text;
 }
 .ant-table.ant-table-fixed-header .ant-table-tbody .ant-table-row:nth-child(even) td {
-  background: #ffffff !important;
+  background: #ffffff;
 }
 .ant-table.ant-table-fixed-header .ant-table-tbody .ant-table-row:nth-child(odd) {
   background-color: var(--zaui-table-strip-bg, #fafafa);

package/es/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -89,6 +89,9 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     rest = _objectWithoutProperties(props, _excluded);
   var _ref2 = useProConfig('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
+  var _ref3 = diffConfig || {},
+    _ref3$scrollFollowPar = _ref3.scrollFollowParent,
+    scrollFollowParent = _ref3$scrollFollowPar === void 0 ? true : _ref3$scrollFollowPar;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
@@ -119,7 +122,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var tipContent = useMemo(function () {
     var _getValueProps;
     if (!isWatch || noChange) return undefined;
-    var orgValue = getValueProps ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
+    var orgValue = getValueProps && !names ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
     // 兼容viewRender函数和Element场景
     var _children = children;
     if (viewRender) {
@@ -150,12 +153,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   return _jsx(_Tooltip, {
     // 传入undefined 鼠标移入显示移出隐藏
     open: tipOpenCalc(),
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
-    },
-    overlayStyle: {
-      zIndex: 99
+    getPopupContainer: function getPopupContainer(trigger) {
+      return scrollFollowParent ? trigger.parentElement : document.body;
     },
+    overlayClassName: "original-value-tootip",
     title: _jsxs(_Space, {
       direction: "vertical",
       className: "changed-tooltip",
@@ -166,13 +167,15 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       }), _showEllipse && _jsxs(_Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
-          isView: true
+          isView: true,
+          scrollFollowParent: scrollFollowParent
         })) : undefined]
       })]
     }),
     children: _jsx("div", {
       className: diffClassName,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+        scrollFollowParent: scrollFollowParent,
         otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/es/ProEditTable/components/RenderField/index.js

@@ -73,7 +73,8 @@ var RenderField = function RenderField(_ref) {
     rowDisabled = config.rowDisabled,
     _config$validateTrigg = config.validateTrigger,
     validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
-    otherProps = config.otherProps;
+    otherProps = config.otherProps,
+    diffConfig = config.diffConfig;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -567,6 +568,7 @@ var RenderField = function RenderField(_ref) {
         normalize: _formItemProps.normalize,
         getValueProps: _formItemProps.getValueProps,
         viewRender: viewRender && viewRenderFun,
+        diffConfig: diffConfig,
         children: FieldComponent
       });
     }

package/es/ProEditTable/index.js

@@ -9,7 +9,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray, isBoolean } from 'lodash';
@@ -23,7 +23,7 @@ import Empty from '../assets/empty.png';
 import locale, { formatMessage } from '../locale';
 import { BaseTable, DraggableTable, VirtualTable } from './components/RcTable';
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _themeConfig$data2;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
@@ -57,6 +57,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
     actionDirection = _ref.actionDirection,
+    diffConfig = _ref.diffConfig,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -167,7 +168,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalValues: originalValues,
     prefixCls: prefixCls,
     rowDisabled: rowDisabled,
-    actionDirection: actionDirection
+    actionDirection: actionDirection,
+    diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig)
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {

package/es/ProEditTable/propsType.d.ts

@@ -270,4 +270,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     ref?: any;
     actionDirection?: 'vertical' | 'horizontal';
     validateTrigger?: string | string[];
+    diffConfig?: {
+        scrollFollowParent?: boolean;
+    };
 }

package/es/ProEditTable/style/index.less

@@ -284,7 +284,6 @@
   .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
     td, .@{ant-prefix}-table-cell-row-hover {
       background: var(--zaui-contract-bg-add, #d2fff4) !important;
-      
     }
   }
 }

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

@@ -33,7 +33,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
     isDiffAll = _useProConfig.isDiffAll;
   var originalValues = diffConfig.originalValues,
     changeTipColor = diffConfig.changeTipColor,
-    addTipColor = diffConfig.addTipColor;
+    addTipColor = diffConfig.addTipColor,
+    _diffConfig$scrollFol = diffConfig.scrollFollowParent,
+    scrollFollowParent = _diffConfig$scrollFol === void 0 ? true : _diffConfig$scrollFol;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
@@ -96,8 +98,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   return _jsx(_Tooltip, {
     open: tipOpenCalc(),
     // open
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
+    getPopupContainer: function getPopupContainer(trigger) {
+      return scrollFollowParent ? trigger.parentElement : document.body;
     },
     overlayClassName: "original-value-tootip",
     title: _jsxs(_Space, {
@@ -110,6 +112,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
       }), _showEllipse && _jsxs(_Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+          scrollFollowParent: scrollFollowParent,
           isView: true
         })) : undefined]
       })]
@@ -119,6 +122,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
       className: diffClassName,
       style: style,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+        scrollFollowParent: scrollFollowParent,
         otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/es/ProForm/propsType.d.ts

@@ -56,6 +56,8 @@ export interface DiffConfigProps<Values = any> {
     changeTipColor?: string;
     /** 新增提示颜色 */
     addTipColor?: string;
+    /** 是否跟随父组件滚动 */
+    scrollFollowParent?: string;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;

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

@@ -122,6 +122,7 @@ export var formatColumn = function formatColumn(_ref2) {
       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 isInNewRowFlag = isInNewRow(record);
+      var extraDiffFlag = false;
       // 把比对结果告诉我
       if (onDiff) {
         var isDiff = onDiff({
@@ -130,11 +131,14 @@ export var formatColumn = function formatColumn(_ref2) {
         });
         if (!isDiff) {
           originalValue = null;
+        } else {
+          originalValue = true;
+          extraDiffFlag = true;
         }
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: !originalValue && originalValue !== 0 ? null : originalRenderValue,
+        originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,

package/es/style/theme/antd.less

@@ -323,7 +323,7 @@
     .@{ant-prefix}-table-tbody {
       .@{ant-prefix}-table-row:nth-child(even) {
         td {
-          background: #ffffff !important;
+          background: #ffffff;
         }
       }
 

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -94,6 +94,9 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
+  var _ref3 = diffConfig || {},
+    _ref3$scrollFollowPar = _ref3.scrollFollowParent,
+    scrollFollowParent = _ref3$scrollFollowPar === void 0 ? true : _ref3$scrollFollowPar;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
@@ -124,7 +127,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var tipContent = (0, _react.useMemo)(function () {
     var _getValueProps;
     if (!isWatch || noChange) return undefined;
-    var orgValue = getValueProps ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
+    var orgValue = getValueProps && !names ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : originalValue;
     // 兼容viewRender函数和Element场景
     var _children = children;
     if (viewRender) {
@@ -157,12 +160,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   , {
     // 传入undefined 鼠标移入显示移出隐藏
     open: tipOpenCalc(),
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
-    },
-    overlayStyle: {
-      zIndex: 99
+    getPopupContainer: function getPopupContainer(trigger) {
+      return scrollFollowParent ? trigger.parentElement : document.body;
     },
+    overlayClassName: "original-value-tootip",
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       direction: "vertical",
       className: "changed-tooltip",
@@ -173,13 +174,15 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
-          isView: true
+          isView: true,
+          scrollFollowParent: scrollFollowParent
         })) : undefined]
       })]
     }),
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+        scrollFollowParent: scrollFollowParent,
         otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/lib/ProEditTable/components/RenderField/index.js

@@ -80,7 +80,8 @@ var RenderField = function RenderField(_ref) {
     rowDisabled = config.rowDisabled,
     _config$validateTrigg = config.validateTrigger,
     validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
-    otherProps = config.otherProps;
+    otherProps = config.otherProps,
+    diffConfig = config.diffConfig;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -574,6 +575,7 @@ var RenderField = function RenderField(_ref) {
         normalize: _formItemProps.normalize,
         getValueProps: _formItemProps.getValueProps,
         viewRender: viewRender && viewRenderFun,
+        diffConfig: diffConfig,
         children: FieldComponent
       });
     }

package/lib/ProEditTable/index.js

@@ -24,9 +24,9 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
 var _RcTable = require("./components/RcTable");
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _themeConfig$data2;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
@@ -60,6 +60,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
     actionDirection = _ref.actionDirection,
+    diffConfig = _ref.diffConfig,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
@@ -170,7 +171,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalValues: originalValues,
     prefixCls: prefixCls,
     rowDisabled: rowDisabled,
-    actionDirection: actionDirection
+    actionDirection: actionDirection,
+    diffConfig: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig)
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {

package/lib/ProEditTable/propsType.d.ts

@@ -270,4 +270,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     ref?: any;
     actionDirection?: 'vertical' | 'horizontal';
     validateTrigger?: string | string[];
+    diffConfig?: {
+        scrollFollowParent?: boolean;
+    };
 }

package/lib/ProEditTable/style/index.less

@@ -284,7 +284,6 @@
   .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
     td, .@{ant-prefix}-table-cell-row-hover {
       background: var(--zaui-contract-bg-add, #d2fff4) !important;
-      
     }
   }
 }

package/lib/ProForm/components/render/ChangedWrapper.js

@@ -38,7 +38,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
     isDiffAll = _useProConfig.isDiffAll;
   var originalValues = diffConfig.originalValues,
     changeTipColor = diffConfig.changeTipColor,
-    addTipColor = diffConfig.addTipColor;
+    addTipColor = diffConfig.addTipColor,
+    _diffConfig$scrollFol = diffConfig.scrollFollowParent,
+    scrollFollowParent = _diffConfig$scrollFol === void 0 ? true : _diffConfig$scrollFol;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
@@ -101,8 +103,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: tipOpenCalc(),
     // open
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
+    getPopupContainer: function getPopupContainer(trigger) {
+      return scrollFollowParent ? trigger.parentElement : document.body;
     },
     overlayClassName: "original-value-tootip",
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -115,6 +117,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
       }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+          scrollFollowParent: scrollFollowParent,
           isView: true
         })) : undefined]
       })]
@@ -124,6 +127,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
       className: diffClassName,
       style: style,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+        scrollFollowParent: scrollFollowParent,
         otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/lib/ProForm/propsType.d.ts

@@ -56,6 +56,8 @@ export interface DiffConfigProps<Values = any> {
     changeTipColor?: string;
     /** 新增提示颜色 */
     addTipColor?: string;
+    /** 是否跟随父组件滚动 */
+    scrollFollowParent?: string;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;

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

@@ -128,6 +128,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       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 isInNewRowFlag = isInNewRow(record);
+      var extraDiffFlag = false;
       // 把比对结果告诉我
       if (onDiff) {
         var isDiff = onDiff({
@@ -136,11 +137,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
         if (!isDiff) {
           originalValue = null;
+        } else {
+          originalValue = true;
+          extraDiffFlag = true;
         }
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
-        originalValue: !originalValue && originalValue !== 0 ? null : originalRenderValue,
+        originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,

package/lib/style/theme/antd.less

@@ -323,7 +323,7 @@
     .@{ant-prefix}-table-tbody {
       .@{ant-prefix}-table-row:nth-child(even) {
         td {
-          background: #ffffff !important;
+          background: #ffffff;
         }
       }
 

package/package.json

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

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}