@zat-design/sisyphus-react 3.8.3 → 3.9.0

package/.vscode/extensions.json

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

package/dist/index.esm.css

@@ -1914,6 +1914,16 @@
   background: var(--zaui-contract-bg, #fffaa1) !important;
   border-radius: var(--zaui-border-radius, 8px);
 }
+.pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.pro-table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .pro-table tbody.ant-table-tbody .varied-cell.empty-cell {
   width: 24.5px;
 }
@@ -2823,6 +2833,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: unset;
   visibility: hidden;
 }
+.pro-form.pro-form-view .pro-group .ant-space-item,
+.pro-form.pro-form-view .pro-group .pro-form-view-container {
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+}
 .pro-form.pro-form-view .ant-form-item-label label {
   color: var(--zaui-aide-text, #939599);
 }
@@ -3029,6 +3045,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-radius: 4px;
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
+.pro-form .pro-form-item-changed .ant-input {
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
 .pro-form .pro-form-item-changed .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
@@ -3086,6 +3105,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-radius: 4px;
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
+.pro-form .pro-form-item-add .ant-input {
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
 .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
@@ -3139,10 +3161,23 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
-.changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
+.original-value-tootip {
+  max-width: 100%;
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+  z-index: 99;
+}
+.original-value-tootip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
-.changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
+.original-value-tootip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
+  display: block;
+}
+.original-value-tootip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
+  word-break: keep-all;
+}
+.original-value-tootip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
@@ -5615,7 +5650,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/dist/less.esm.css

@@ -1914,6 +1914,16 @@
   background: var(--zaui-contract-bg, #fffaa1) !important;
   border-radius: var(--zaui-border-radius, 8px);
 }
+.pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.pro-table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .pro-table tbody.ant-table-tbody .varied-cell.empty-cell {
   width: 24.5px;
 }
@@ -2823,6 +2833,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: unset;
   visibility: hidden;
 }
+.pro-form.pro-form-view .pro-group .ant-space-item,
+.pro-form.pro-form-view .pro-group .pro-form-view-container {
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+}
 .pro-form.pro-form-view .ant-form-item-label label {
   color: var(--zaui-aide-text, #939599);
 }
@@ -3029,6 +3045,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-radius: 4px;
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
+.pro-form .pro-form-item-changed .ant-input {
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
 .pro-form .pro-form-item-changed .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
@@ -3086,6 +3105,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-radius: 4px;
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
+.pro-form .pro-form-item-add .ant-input {
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
 .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
@@ -3139,10 +3161,23 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
-.changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
+.original-value-tootip {
+  max-width: 100%;
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+  z-index: 99;
+}
+.original-value-tootip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
-.changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
+.original-value-tootip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
+  display: block;
+}
+.original-value-tootip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
+  word-break: keep-all;
+}
+.original-value-tootip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {

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

@@ -1,13 +1,13 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useMemo } from 'react';
+import React, { useMemo, useRef } from 'react';
 import classNames from 'classnames';
 import { get } from 'lodash';
 import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
@@ -34,6 +34,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
@@ -42,7 +43,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = 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;
@@ -58,15 +59,21 @@ var getOriginalValue = function getOriginalValue(_ref) {
     } else {
       originalValue = 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 get(originalValues, originalName);
-  }) : get(originalValues, originalName);
+  return {
+    originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+      return get(originalValues, originalName);
+    }) : get(originalValues, originalName),
+    originalValueRow: originalValueRow
+  };
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
-  var _getValueProps;
+  var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -84,21 +91,30 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     getValueProps = props.getValueProps,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
+    viewRender = props.viewRender,
+    diffConfig = props.diffConfig,
+    index = props.index,
     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 contentRef = 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 : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
@@ -113,28 +129,75 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
+  var tipContent = useMemo(function () {
+    var _getValueProps;
+    if (!isWatch || noChange) return undefined;
+    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.isValidElement(viewRender)) {
+        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValueRow) || {}, {
+          form: form,
+          name: name,
+          index: index
+        });
+      }
+      _children = viewRender;
+    }
+    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, _defineProperty(_defineProperty({
+      // @ts-ignore
+      isView: true
+    }, valuePropName, orgValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
+  }, [originalValue, children]);
   if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, 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 = classNames({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
+  var open = tipOpenCalc();
   return _jsx(_Tooltip, {
-    // 传入undefined 鼠标移入显示移出隐藏
-    open: isChanged ? undefined : false,
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
+    open: open,
+    getPopupContainer: function getPopupContainer(trigger) {
+      return scrollFollowParent ? trigger.parentElement : document.body;
     },
+    overlayClassName: "original-value-tootip",
+    placement: "topLeft",
+    autoAdjustOverflow: false,
     title: _jsxs(_Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, _defineProperty(_defineProperty({
-        // @ts-ignore
-        isView: true
-      }, valuePropName, getValueProps ? (_getValueProps = getValueProps(originalValue)) === null || _getValueProps === void 0 ? void 0 : _getValueProps[valuePropName] : props[valuePropName]), "checked", type === 'Switch' ? originalValue : undefined))) : undefined]
+      direction: "vertical",
+      className: "changed-tooltip",
+      children: [_jsxs(_Space, {
+        align: "start",
+        className: "original-value-container",
+        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      }), _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,
+          scrollFollowParent: scrollFollowParent
+        })) : undefined]
+      })]
     }),
     children: _jsx("div", {
       className: diffClassName,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
+      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
+        })
+      })) : undefined
     })
   });
 };

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;
@@ -254,7 +255,7 @@ var RenderField = function RenderField(_ref) {
     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 = viewRender(currentValue, record, options);
+      var View = viewRender(currentValue, record || {}, options);
       TargetComponent = _jsx(Container, {
         viewEmpty: viewEmpty,
         children: View
@@ -560,6 +561,9 @@ var RenderField = function RenderField(_ref) {
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
         getValueProps: _formItemProps.getValueProps,
+        viewRender: viewRender,
+        diffConfig: diffConfig,
+        index: index,
         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", "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"];
 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,
@@ -51,13 +51,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 = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -89,7 +89,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return (_ref2 = (_themeConfig$data$zau = themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiFormAlign) !== null && _themeConfig$data$zau !== void 0 ? _themeConfig$data$zau : configRequiredAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left';
   }, [themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data2 = themeConfig.data) === null || _themeConfig$data2 === void 0 ? void 0 : _themeConfig$data2.zauiFormAlign]);
   var _useSetState = useSetState({
-      _columns: columns,
       cellNamePath: [],
       forceUpdate: {},
       editingKeys: [],
@@ -167,10 +166,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: _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) {
@@ -275,8 +274,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var _columns = useMemo(function () {
     return transformColumns(columns, config);
   }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
-  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;
     });
@@ -285,8 +284,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 _objectSpread(_objectSpread({}, item), {}, {
@@ -301,6 +307,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         form.setFieldValue(virtualRowName, nextValues);
       }
     }
+  };
+  useEffect(function () {
+    initDataSource();
   }, [value, originalValues]);
   useImperativeHandle((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
     return {

package/es/ProEditTable/propsType.d.ts

@@ -109,7 +109,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
 export interface State {
-    _columns: ProEditTableColumnsProps[];
     cellNamePath: NamePath[];
     forceUpdate: {};
     editingKeys: string[];
@@ -139,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       可编辑表格的类型，单行编辑或者多行编辑
@@ -276,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/ProEditTable/utils/index.js

@@ -335,14 +335,21 @@ export var transformColumns = function transformColumns() {
         });
       }
       // 单行多行交互有较大差异
-      return _jsx("div", {
+      return _jsxs("div", {
         className: cellClassName,
         onClick: function onClick() {
           isCanEdit && setState({
             cellNamePath: cellName
           });
         },
-        children: _jsx(RenderField, {
+        children: [index === 0 && !item.width ? _jsx("div", {
+          style: {
+            visibility: 'hidden',
+            height: 0,
+            paddingLeft: (item === null || item === void 0 ? void 0 : item.required) ? 16 : 0
+          },
+          children: columnTitle
+        }) : null, _jsx(RenderField, {
           text: _text,
           record: record,
           index: index,
@@ -351,7 +358,7 @@ export var transformColumns = function transformColumns() {
             cellName: cellName,
             isEditing: isEditing // 是否正在编辑
           })
-        })
+        })]
       });
     };
     item.render = _render;

package/es/ProForm/components/base/InputNumber/index.js

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

package/es/ProForm/components/combination/FormList/components/BlockFields.d.ts

@@ -3,6 +3,7 @@ import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
 import type { levelType } from '../../../../../ProLayout/components/ProCollapse/PropTypes';
 import type { FormListProps } from '../propsType';
+import { DiffConfigProps } from '../../../../propsType';
 interface Props extends Omit<FormListProps, 'toolbarProps'> {
     index: number;
     namePath: InternalNamePath;
@@ -14,6 +15,7 @@ interface Props extends Omit<FormListProps, 'toolbarProps'> {
     };
     level?: levelType;
     towCollapse?: boolean;
+    diffConfig?: DiffConfigProps;
 }
 declare const BlockFields: React.FC<Props>;
 export default BlockFields;

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -31,7 +31,8 @@ var BlockFields = function BlockFields(props) {
     _props$level = props.level,
     level = _props$level === void 0 ? '2' : _props$level,
     towCollapse = props.towCollapse,
-    id = props.id;
+    id = props.id,
+    diffConfig = props.diffConfig;
   var _title = useMemo(function () {
     if (isFunction(title)) {
       var record = form.getFieldValue(namePath);
@@ -73,7 +74,8 @@ var BlockFields = function BlockFields(props) {
           form: form,
           colProps: colProps,
           disabled: disabled,
-          isView: isView
+          isView: isView,
+          diffConfig: diffConfig
         })
       }, field.key)
     })

package/es/ProForm/components/combination/FormList/components/LineFields.d.ts

@@ -2,6 +2,7 @@ import { ColProps, FormListFieldData } from 'antd';
 import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
 import { FormListProps } from '../propsType';
+import { DiffConfigProps } from '../../../../propsType';
 interface Props extends Omit<FormListProps, 'toolbarProps'> {
     className?: string;
     index: number;
@@ -12,6 +13,7 @@ interface Props extends Omit<FormListProps, 'toolbarProps'> {
     field: Omit<FormListFieldData, 'key'> & {
         key: string;
     };
+    diffConfig?: DiffConfigProps;
 }
 declare const LineFields: React.FC<Props>;
 export default LineFields;

package/es/ProForm/components/combination/FormList/components/LineFields.js

@@ -29,7 +29,8 @@ var LineFields = function LineFields(props) {
     isView = props.isView,
     draggable = props.draggable,
     className = props.className,
-    id = props.id;
+    id = props.id,
+    diffConfig = props.diffConfig;
   var isLess = mode === 'less';
   var _useSortable = useSortable({
       id: field.key,
@@ -70,7 +71,8 @@ var LineFields = function LineFields(props) {
         form: form,
         colProps: colProps,
         disabled: disabled,
-        isView: isView
+        isView: isView,
+        diffConfig: diffConfig
       })
     }), actionProps !== false && _jsx(ActionButton, {
       min: min,