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

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

@@ -73,7 +73,7 @@ export var formatColumn = function formatColumn(_ref2) {
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
-    diffTeleport = column.diffTeleport;
+    onDiff = column.onDiff;
   // 仅在 {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({
@@ -110,7 +110,7 @@ export var formatColumn = function formatColumn(_ref2) {
     }
   };
   if (column === null || column === void 0 ? void 0 : column.render) {
-    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0 && !diffTeleport) {
+    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0 && !onDiff) {
       return;
     }
     var originalRender = column.render; // 保存原始的 render 方法
@@ -118,20 +118,27 @@ export var formatColumn = function formatColumn(_ref2) {
     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) : undefined;
+      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) : undefined;
+      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 (diffTeleport) {
-        var isDiff = diffTeleport(value, record, index, originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]);
+      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]]
+        });
         if (!isDiff) {
-          originalValue = undefined;
+          originalValue = null;
+        } else {
+          originalValue = true;
+          extraDiffFlag = true;
         }
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: originalValue === undefined ? undefined : originalRenderValue,
+        originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         value: _value,
@@ -390,7 +397,6 @@ export var formatColumn = function formatColumn(_ref2) {
         });
       }
       var className = classnames({
-        'varied-cell': originalValue !== undefined,
         'empty-cell': isEmpty
       });
       var renderValue = _jsx(ProForm.ProCascader, {
@@ -416,7 +422,7 @@ export var formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: originalRealValue === undefined ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis !== null && ellipsis !== void 0 ? ellipsis : true,
         width: width,
         node: renderNode,

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

@@ -1,3 +1,5 @@
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
@@ -32,7 +34,7 @@ var RenderColumn = function RenderColumn(props) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
-  if (originalValue !== undefined && !isInNewRowFlag) {
+  if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
       if (ellipsis) {
@@ -53,11 +55,23 @@ var RenderColumn = function RenderColumn(props) {
           width: width,
           minWidth: minWidth
         },
-        title: originalDiffTip ? _jsxs(_Fragment, {
-          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? _jsxs("span", {
-            children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
-          }) : undefined]
-        }) : node,
+        overlayClassName: "original-value-tootip",
+        title: _jsx(_Space, {
+          direction: "vertical",
+          className: "changed-tooltip",
+          children: originalDiffTip ? _jsxs(_Fragment, {
+            children: [_jsxs(_Space, {
+              align: "start",
+              className: "original-value-container",
+              children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
+            }), _jsx(_Space, {
+              className: "current-value-container",
+              children: ellipsis ? _jsxs("span", {
+                children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
+              }) : null
+            })]
+          }) : node
+        }),
         getPopupContainer: function getPopupContainer(triggerNode) {
           return triggerNode.parentNode;
         }

package/es/ProTable/propsType.d.ts

@@ -41,7 +41,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
     show?: boolean | (() => boolean);
-    diffTeleport?: (value: any, record: any, index: number, originalRecord?: any) => boolean;
+    onDiff?: ({ value, originValue }: {
+        value: any;
+        originValue: any;
+    }) => boolean;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

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/es/utils/index.d.ts

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

package/es/utils/index.js

@@ -1,3 +1,5 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useEffect, useState } from 'react';
 var EMPTY_VALUE = [undefined, null, ''];
 /** 判断一个值是否是空值 */
 export var isEmpty = function isEmpty(value) {
@@ -10,4 +12,28 @@ export var isEmpty = function isEmpty(value) {
     });
   }
   return false;
+};
+export var useFocus = function useFocus(element) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    focus = _useState2[0],
+    setFocus = _useState2[1];
+  useEffect(function () {
+    if (!element) return;
+    element.addEventListener('focus', function () {
+      setFocus(true);
+    }, true);
+    element.addEventListener('blur', function () {
+      setFocus(false);
+    }, true);
+    return function () {
+      element.removeEventListener('focus', function () {
+        setFocus(true);
+      }, true);
+      element.removeEventListener('blur', function () {
+        setFocus(false);
+      }, true);
+    };
+  }, [element]);
+  return focus;
 };

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

@@ -17,7 +17,7 @@ var _lodash = require("lodash");
 var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -39,6 +39,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   if (!originalValues) {
     return undefined;
   }
+  var originalValueRow;
   if (rowKeyPath) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
@@ -47,7 +48,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = (0, _lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    var originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
+    originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
@@ -63,14 +64,21 @@ var getOriginalValue = function getOriginalValue(_ref) {
     } else {
       originalValue = (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
     }
-    return originalValue;
+    return {
+      originalValue: originalValue,
+      originalValueRow: originalValueRow
+    };
   }
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
-  return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-    return (0, _lodash.get)(originalValues, originalName);
-  }) : (0, _lodash.get)(originalValues, originalName);
+  return {
+    originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+      return (0, _lodash.get)(originalValues, originalName);
+    }) : (0, _lodash.get)(originalValues, originalName),
+    originalValueRow: originalValueRow
+  };
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
+  var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -89,21 +97,29 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     viewRender = props.viewRender,
+    diffConfig = props.diffConfig,
+    index = props.index,
     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 contentRef = (0, _react.useRef)(null);
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
+  var toolTip = (_diffConfig$toolTip = diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   var isWatch = Boolean(originalValues);
-  var originalValue = isWatch ? getOriginalValue({
+  var originalDTO = getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
     originalValues: originalValues,
     rowKeyPath: rowKeyPath,
     form: form
-  }) : undefined;
+  });
+  var originalValue = isWatch ? originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValue : undefined;
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
@@ -121,12 +137,16 @@ 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) {
       if (! /*#__PURE__*/_react.default.isValidElement(viewRender)) {
-        return viewRender(orgValue);
+        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValueRow) || {}, {
+          form: form,
+          name: name,
+          index: index
+        });
       }
       _children = viewRender;
     }
@@ -138,24 +158,51 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   if (!isWatch || noChange) {
     return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest));
   }
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  // const isFocus = useFocus(contentRef.current);
+  var tipOpenCalc = function tipOpenCalc() {
+    if (!toolTip) return false;
+    // 传入undefined 鼠标移入显示移出隐藏
+    return isChanged ? undefined : false;
+  };
+  // @ts-ignore
+  var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
   var diffClassName = (0, _classnames.default)({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
-  return (0, _jsxRuntime.jsx)(_antd.Tooltip
-  // 传入undefined 鼠标移入显示移出隐藏
-  , {
-    // 传入undefined 鼠标移入显示移出隐藏
-    open: isChanged ? undefined : false,
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
+  var open = tipOpenCalc();
+  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    open: open,
+    getPopupContainer: function getPopupContainer(trigger) {
+      return scrollFollowParent ? trigger.parentElement : document.body;
     },
+    overlayClassName: "original-value-tootip",
+    placement: "topLeft",
+    autoAdjustOverflow: false,
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      direction: "vertical",
+      className: "changed-tooltip",
+      children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
+        align: "start",
+        className: "original-value-container",
+        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      }), _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,
+          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)({}, children.props), rest)) : undefined
+      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
+        })
+      })) : undefined
     })
   });
 };

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;
@@ -255,19 +256,13 @@ var RenderField = function RenderField(_ref) {
       TargetComponent = _editRender;
     }
   }
-  var viewRenderFun = function viewRenderFun(value) {
-    if (/*#__PURE__*/_react.default.isValidElement(viewRender)) {
-      return viewRender;
-    }
-    return viewRender === null || viewRender === void 0 ? void 0 : viewRender(value, record, options);
-  };
   // 查看模式
   if (isView) {
     // 存在viewRender覆盖默认值
     if (typeof viewRender === 'function') {
       var _column$dataIndex;
       currentValue = (column === null || column === void 0 ? void 0 : (_column$dataIndex = column.dataIndex) === null || _column$dataIndex === void 0 ? void 0 : _column$dataIndex.includes('-')) ? value : currentValue;
-      var View = viewRenderFun(currentValue);
+      var View = viewRender(currentValue, record || {}, options);
       TargetComponent = (0, _jsxRuntime.jsx)(_Container.default, {
         viewEmpty: viewEmpty,
         children: View
@@ -573,7 +568,9 @@ var RenderField = function RenderField(_ref) {
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
         getValueProps: _formItemProps.getValueProps,
-        viewRender: viewRender && viewRenderFun,
+        viewRender: viewRender,
+        diffConfig: diffConfig,
+        index: index,
         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", "originalDiffTip", "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,
@@ -54,13 +54,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
-    originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
     rowDraggable = _ref.rowDraggable,
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
     actionDirection = _ref.actionDirection,
+    diffConfig = _ref.diffConfig,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
@@ -169,10 +169,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableLength: value === null || value === void 0 ? void 0 : value.length,
     page: page,
     originalValues: originalValues,
-    originalDiffTip: originalDiffTip,
     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) {
@@ -277,8 +277,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var _columns = (0, _react.useMemo)(function () {
     return (0, _utils.transformColumns)(columns, config);
   }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
-  (0, _react.useEffect)(function () {
-    var _value$every, _originalArr$every;
+  var initDataSource = function initDataSource() {
+    var _value$every, _originalArr$every, _value$some, _originalArr$some;
     var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
       return item.rowKey;
     });
@@ -287,8 +287,15 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
       return item.rowKey;
     }) : true;
+    // 检测当前rowkey是否与制定key的值是否一致，不一致，则执行覆盖
+    var isNeedCover = value === null || value === void 0 ? void 0 : (_value$some = value.some) === null || _value$some === void 0 ? void 0 : _value$some.call(value, function (item) {
+      return item.rowKey !== getRowKey(item);
+    });
+    var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
+      return item.rowKey !== getRowKey(item);
+    });
     // 初始化默认生成row-key
-    if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && !isOriginalAllHasKey) {
+    if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover) || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && (!isOriginalAllHasKey || isNeedCoverOriginal)) {
       var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
@@ -303,6 +310,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         form.setFieldValue(virtualRowName, nextValues);
       }
     }
+  };
+  (0, _react.useEffect)(function () {
+    initDataSource();
   }, [value, originalValues]);
   (0, _react.useImperativeHandle)((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
     return {

package/lib/ProEditTable/propsType.d.ts

@@ -138,11 +138,6 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @description       原始数据源，是否tooltip显示
      * @default           -
      */
-    originalDiffTip?: boolean;
-    /**
-     * @description       可编辑表格的类型，单行、多行、单元格编辑
-     * @default           false
-     */
     mode?: 'single' | 'multiple' | 'cell';
     /**
      * @description       可编辑表格的类型，单行编辑或者多行编辑
@@ -275,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/base/InputNumber/index.js

@@ -290,7 +290,7 @@ var InputNumber = function InputNumber(props) {
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label !== null && label !== void 0 ? label : ''),
     className: _className
-  }, valueProps), initialConfig), rest), {}, {
+  }, initialConfig), valueProps), rest), {}, {
     onBlur: handleBlur,
     onFocus: handleFocus,
     min: _min,

package/lib/ProForm/components/combination/Group/index.js

@@ -32,15 +32,14 @@ var Group = function Group(props) {
     value = props.value,
     onChange = props.onChange,
     otherProps = props.otherProps,
-    disabled = props.disabled,
-    id = props.id,
-    isView = props.isView;
+    id = props.id;
   var contextProps = _ProForm.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
     form = contextProps.form,
     namePath = contextProps.namePath,
-    index = contextProps.index;
+    index = contextProps.index,
+    isView = contextProps.isView;
   var _option = _react.default.useRef([]);
   // 组合onChange
   var handleChange = function handleChange(value, option, index) {

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -79,7 +79,7 @@ var ProCascader = function ProCascader(props) {
     code = _props$code === void 0 ? configCode : _props$code,
     tooltip = props.tooltip,
     _props$separator = props.separator,
-    separator = _props$separator === void 0 ? '' : _props$separator,
+    separator = _props$separator === void 0 ? '/' : _props$separator,
     detailPlaceholder = props.detailPlaceholder,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},

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

@@ -34,11 +34,14 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getValueProps = props.getValueProps,
     viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  // const contentRef = useRef(null);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     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) {
@@ -59,9 +62,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   var viewRenderFun = (0, _react.useMemo)(function () {
-    var record = form.getFieldsValue();
     return function (orgValue) {
-      return viewRender(orgValue, record, {
+      return viewRender(orgValue, originalValues, {
         form: form
       });
     };
@@ -83,27 +85,30 @@ var ChangedWrapper = function ChangedWrapper(props) {
       originalValues: isNestedField ? originalValues : undefined
     }, children.props), rest));
   }
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  // const isFocus = useFocus(contentRef.current);
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
-    // 传入undefined 鼠标移入显示移出隐藏
+    // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡
     return isChanged ? undefined : false;
   };
   var style = {
     '--zaui-contract-bg': changeTipColor,
     '--zaui-contract-bg-add': addTipColor
   };
+  // @ts-ignore
+  var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
   var diffClassName = (0, _classnames.default)({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
-  // @ts-ignore
-  var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
+  var open = tipOpenCalc();
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: tipOpenCalc(),
-    // mouseEnterDelay={1}
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
+    open: open,
+    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",
@@ -114,6 +119,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]
       })]
@@ -123,6 +129,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;